From 7e8e8e522817ab4452ba609a935216d505c8bd31 Mon Sep 17 00:00:00 2001 From: ludamad Date: Fri, 15 Mar 2024 11:45:33 -0400 Subject: [PATCH] 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 --- .github/workflows/mirror_noir_subrepo.yml | 2 +- .github/workflows/pull_noir.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/mirror_noir_subrepo.yml b/.github/workflows/mirror_noir_subrepo.yml index 54b45855e72..fe768f76eba 100644 --- 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 index 8ee023b5cb7..c2caab755eb 100644 --- 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