Add .gitattributes file to avoid most Changelog merge conflicts

plone · Nov 12, 2018 · 01150a7 · 01150a7
1 parent f071923
commit 01150a7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1 @@
+CHANGELOG.md merge=union
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,6 +12,7 @@
 
 ## Added
 
+- Add .gitattributes file to avoid most Changelog merge conflicts @pnicolli
 - Buildout for Python 3 @pbauer
 
 ## 1.0.0 (2018-10-31)