diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..6f9ff67
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+CHANGES.rst merge=union
diff --git a/.gitignore b/.gitignore
index 2c2c588..0a48514 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,4 +16,5 @@ lib/
 lib64
 parts/
 src/icalendar.egg-info/
+!.gitattributes
 !.gitignore