🚧 .gitattributes merge strategies

jayvdb · jayvdb · commit 3652990beb7e · 2019-07-12T09:25:13.000+07:00
Use union for changelog yaml, and
use binary for generaged CHANGELOG.rst.
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
