Merge pull request #98 from jayvdb/changelog-union

chfw · web-flow · commit c3a5ed032062 · 2019-07-12T07:32:29.000+01:00
🚧 .gitattributes merge strategies
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,4 @@
+# Include changes from both sides
+changelog.yml merge=union
+# Include regenerated files as-is using binary merge driver
+CHANGELOG.rst merge=binary
