[ci skip] changelog conflicts are a thing of the past (#14098)

nim-lang · Apr 24, 2020 · f07f07e · f07f07e
1 parent b18b1b0
commit f07f07e
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,6 @@
+# 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
+