diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..55ce861
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,2 @@
+# Never merge settings.py - always use branch version
+settings.py merge=ours