feat(git): use gitattributes to automatically resolve conflicts for changelogs

Frederic Spiers · Frederic Spiers · commit bac6e3d2ef12 · 2025-12-05T10:03:35.000+01:00
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1 @@
+**/CHANGELOG.md merge=theirs
