chore(sync-noir): fix modify/delete conflicts automatically (#8090)

Truly fulfill '-X theirs' with https://stackoverflow.com/a/54232519
AztecProtocol · Aug 20, 2024 · a09627c · a09627c
1 parent 7595d91
commit a09627c
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/.github/workflows/pull-noir.yml b/.github/workflows/pull-noir.yml
@@ -119,7 +119,11 @@ jobs:
             # Fix PR branch
             git fetch # see recent change
             git checkout $BRANCH || git checkout -b $BRANCH
-            git merge -Xtheirs origin/$STAGING_BRANCH -m "$COMMIT_MESSAGE"
+            if ! git merge -Xtheirs origin/$STAGING_BRANCH -m "$COMMIT_MESSAGE" ; then
+              # resolve modify/delete conflicts
+              git diff --name-only --diff-filter=U | xargs git rm
+              git commit -m "$COMMIT_MESSAGE"
+            fi
             git push origin $BRANCH
           }
           force_sync_staging