Update .gitattributes for merge conflict resolution

mollyim · Apr 23, 2024 · 9cc1d39 · 9cc1d39
1 parent 9117a15
commit 9cc1d39
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/.gitattributes b/.gitattributes
@@ -1 +1,8 @@
-*.ai binary
+# MOLLY: Reduce the number of merge conflicts.
+#
+# Note: also need:
+# git config merge.ours.driver true
+# git config merge.theirs.driver 'cp -- %B %A'
+
+/app/src/main/res/values-*/strings.xml merge=theirs
+/gradle/verification-metadata.xml merge=union