1234567 |
- # Avoids changelog conflicts by assuming additions-only, which is by far the common case.
- # In the rare case where branch b1 rebases against branch b2 and both branches
- # modified the same changelog entry, you'll end up with that changelog entry
- # duplicated, which is easily identifiable and fixable.
- /changelog.md merge=union
|