fix: Revert "fix: noir mirror merge strat" (#5250)

This caused bigger problems than -Xtheirs did, oops. Sometimes merges will just get stuck, c'est la vie
AztecProtocol · Mar 15, 2024 · 7e8e8e5 · 7e8e8e5
1 parent 9cc32cb
commit 7e8e8e5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.github/workflows/mirror_noir_subrepo.yml b/.github/workflows/mirror_noir_subrepo.yml
@@ -117,7 +117,7 @@ jobs:
             cd noir-repo
             git fetch # see recent change
             git checkout $BRANCH || git checkout -b $BRANCH
-            git merge -Xours origin/$STAGING_BRANCH -m "$COMMIT_MESSAGE"
+            git merge -Xtheirs origin/$STAGING_BRANCH -m "$COMMIT_MESSAGE"
             git push origin $BRANCH
             cd ..
           }

diff --git a/.github/workflows/pull_noir.yml b/.github/workflows/pull_noir.yml
@@ -103,7 +103,7 @@ jobs:
             # Fix PR branch
             git fetch # see recent change
             git checkout $BRANCH || git checkout -b $BRANCH
-            git merge -Xours origin/$STAGING_BRANCH -m "$COMMIT_MESSAGE"
+            git merge -Xtheirs origin/$STAGING_BRANCH -m "$COMMIT_MESSAGE"
             git push origin $BRANCH
           }
           force_sync_staging