Update .gitattributes

hyperTwitch · Mar 12, 2015 · 39b239e · 39b239e
1 parent 5a3bd89
commit 39b239e
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -31,3 +31,7 @@
 # When merging just accept the remote compiled CSS file, built from Sass.
 # If you have local changes, just rebuild and commit. 
 app/view/bolt.css* merge=theirs -diff binary
+
+# This setting forces a union merge for the changelog.md file, 
+# lines will be taken from both sides of the file merge.
+changelog.md merge=union