Update copy.yml

lepasid · May 25, 2024 · 51fd0fc · 51fd0fc
1 parent cbe97f0
commit 51fd0fc
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/.github/workflows/copy.yml b/.github/workflows/copy.yml
@@ -33,5 +33,13 @@ jobs:
           git add "$FILE_NAME"
           git commit -m "Update on $FILE_NAME"
           git fetch origin 2024
-          git merge origin/2024 --allow-unrelated-histories
+          git merge origin/2024 --allow-unrelated-histories || {
+              echo "Merge conflict!!!!!!!!!!!!!!!!!!"
+              git diff --name-only --diff-filter=U
+              git checkout --ours "$FILE_NAME"
+              git add "$FILE_NAME"
+              git checkout --theirs domains
+              git add domains
+              git commit -m "Resolved merge conflicts in 2024-05-25 and domains"
+          }
           git push origin update-$FILE_NAME:2024