Browse Source

Add custom merge strategy for CHANGELOG.md

The merge strategy `union` should hopefully reduce the number of
conflicts when trying to rebase the configuration file, since most of
the changes are simple additions anyways.
Christian Duerr 1 year ago
parent
commit
a842d6827c
1 changed files with 1 additions and 0 deletions
  1. 1 0
      .gitattributes

+ 1 - 0
.gitattributes

@@ -0,0 +1 @@
+/CHANGELOG.md merge=union