From 437440d99b4a3349b0a6860f8e9ec7e37a0997c9 Mon Sep 17 00:00:00 2001 From: Matt Krick Date: Tue, 27 Feb 2024 16:13:17 -0800 Subject: [PATCH] fix: mrege origin/production strategy Signed-off-by: Matt Krick --- .github/workflows/release-to-staging.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-to-staging.yml b/.github/workflows/release-to-staging.yml index 965fc86deaa..22efc4326c4 100644 --- a/.github/workflows/release-to-staging.yml +++ b/.github/workflows/release-to-staging.yml @@ -103,7 +103,7 @@ jobs: git config user.name github-actions git config user.email github-actions@github.com git checkout -b "release/v${{ env.ACTION_VERSION }}" - git merge -s ours production + git merge -s ours origin/production git push --set-upstream origin "release/v${{ env.ACTION_VERSION }}" gh pr create \ --assignee ${{ github.actor }} \