From 9aebb6c942ef461369204f15f8204bab3a5dd25f Mon Sep 17 00:00:00 2001 From: ludamad Date: Tue, 12 Mar 2024 13:40:42 -0400 Subject: [PATCH 1/2] fix: noir mirror merge strat This should be prioritizing manual changes in noir's aztec-packages --- .github/workflows/mirror_noir_subrepo.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/mirror_noir_subrepo.yml b/.github/workflows/mirror_noir_subrepo.yml index fe768f76eba4..54b45855e720 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 .. } From 4bb5dc400a5c6ac0bc57dc7235760fc4c127c764 Mon Sep 17 00:00:00 2001 From: ludamad Date: Tue, 12 Mar 2024 13:41:25 -0400 Subject: [PATCH 2/2] Update pull_noir.yml --- .github/workflows/pull_noir.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pull_noir.yml b/.github/workflows/pull_noir.yml index c2caab755ebf..8ee023b5cb78 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