diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 00000000..d6c5853d
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+Changelog.md merge=union