diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 000000000..eb5d0d373
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+.gitignore merge=ours
\ No newline at end of file