diff --git a/.gitattributes b/.gitattributes
index 16c27cb1a..75e0667b8 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -52,3 +52,6 @@ poetry.lock -text
 *.cmd text eol=crlf
 *.bat text eol=crlf
 
+# Changelogs are append-mostly; auto-merge by unioning both sides.
+packages/*/CHANGELOG.md merge=union
+