diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 000000000..80edb3f0c
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,2 @@
+CHANGELOG.md merge=union
+