diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000000..3d432e03f1
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+/CHANGELOG.md merge=union