diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 000000000..692d65361
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,9 @@
+/CHANGELOG.md merge=union
+*.pdf binary
+*.doc binary
+*.docx binary
+*.ppt binary
+*.pptx binary
+*.xls binary
+*.xlsx binary
+*.xps binary