Use the "union" merge driver for changelogs

neilmayhew · lehins · commit 4ae84dec5c5d · 2025-09-15T09:14:57.000-06:00
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,2 @@
+# In changelogs, take lines from both versions, instead of leaving conflict markers
+CHANGELOG.md merge=union

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+# In changelogs, take lines from both versions, instead of leaving conflict markers`
	`2`	`+CHANGELOG.md merge=union`