Configure .gitattributes to avoid merge conflicts

Artur Minnullin · timurvafin · commit 03ff61aba4b9 · 2016-04-06T18:43:52.000+04:00
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1 @@
+CHANGELOG merge=union
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+- Configure `.gitattributes` to avoid merge conflicts due to `CHANGELOG`
+
 ## 1.8 - 2016-03-22
 
 - Upgrade Rails to 4.2.6, Ruby to 2.3.0, Rollbar to 2.8.3, Spring to 1.6.4
