Skip to content

Commit 9ea81b7

Browse files
authored
fix(docs): add a note about bundling and merge_pr_in_ci (#1165)
Fixes packit/packit#2733 Fixes PACKIT-5184 Since there is no reply on the issue, I’m adding a note to the docs and closing down the issue.
2 parents 7a0a0a6 + 27f51ab commit 9ea81b7

1 file changed

Lines changed: 15 additions & 0 deletions

File tree

docs/configuration/index.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,21 @@ branch, setting this key to `false` can be especially useful not to generate
175175
RPM packages with an NVR referencing an unknown hash (the one created by the
176176
Packit merge commit).
177177

178+
:::tip Packages with bundled dependencies
179+
180+
When you have custom `.gitattributes` and use bundled dependencies, the default
181+
merging may become an issue. In this case it is recommended to disable merging
182+
with
183+
184+
```yaml
185+
merge_pr_in_ci: false
186+
```
187+
188+
If your project requires linear history and you rebase PRs frequently, there are
189+
no incurred disadvantages to turning off this feature.
190+
191+
:::
192+
178193

179194
#### sync_changelog
180195

0 commit comments

Comments
 (0)