.gitattributes 329 B

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