Add .gitattributes to prevent CHANGELOG conflicts

gene1wood · gene1wood · commit 2fcbe59ddb62 · 2019-10-07T16:45:57.000-07:00
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,2 @@
+# http://krlmlr.github.io/using-gitattributes-to-avoid-merge-conflicts/
+/CHANGELOG.md merge=union

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+# http://krlmlr.github.io/using-gitattributes-to-avoid-merge-conflicts/`
	`2`	`+/CHANGELOG.md merge=union`