Add union merge for CHANGELOG to reduce merge conflicts (#15)

As the CHANELOG is updated in each PR this often leads to merge conflicts. As the CHANGELOG normally can be merged with a union merge this should reduce conflicts.
elastic · Jun 6, 2018 · 0934cc3 · 0934cc3
1 parent e17097a
commit 0934cc3
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1 @@
+CHANGELOG.md  merge=union