new file: .gitattributes

2025-08-06 01:44:37 -04:00
parent dc859f15f2
commit 18b7f77284
1 changed files with 2 additions and 0 deletions
@@ -0,0 +1,2 @@
+# Never merge settings.py - always use branch version
+settings.py merge=ours