From 74fa8d6de2da4509a1679f9b1c76c6f22df16139 Mon Sep 17 00:00:00 2001 From: ludamad Date: Tue, 12 Mar 2024 14:54:59 -0400 Subject: [PATCH] fix: noir mirror merge strat (#5166) This should be prioritizing manual changes in noir's aztec-packages --- .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 fe768f76eba..54b45855e72 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 -Xtheirs origin/$STAGING_BRANCH -m "$COMMIT_MESSAGE" + git merge -Xours 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 c2caab755eb..8ee023b5cb7 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 -Xtheirs origin/$STAGING_BRANCH -m "$COMMIT_MESSAGE" + git merge -Xours origin/$STAGING_BRANCH -m "$COMMIT_MESSAGE" git push origin $BRANCH } force_sync_staging