Merge pull request #1116 from rogerluan/changelog-union-merge-strategy

Change CHANGELOG.md merge strategy to union
danger · Feb 18, 2021 · 35a98bb · 35a98bb
2 parents 7fe1d7c + 8eecb0b
commit 35a98bb
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,4 @@
+# .gitattributes documentation: https://git-scm.com/docs/gitattributes
+
+# Resolve 3-way merge conflicts on the CHANGELOG.md file using the union strategy
+CHANGELOG.md merge=union