From 122ae1ebe264c5a7c36fc842256386e0d9274e4c Mon Sep 17 00:00:00 2001
From: Oscar Mira <valldrac@molly.im>
Date: Tue, 23 Apr 2024 10:32:43 +0200
Subject: [PATCH] Update .gitattributes for merge conflict resolution

---
 .gitattributes | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/.gitattributes b/.gitattributes
index 47f6d98b40..03e65f1908 100644
--- 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