Skip to content

Commit

Permalink
fix: mrege origin/production strategy
Browse files Browse the repository at this point in the history
Signed-off-by: Matt Krick <[email protected]>
  • Loading branch information
mattkrick committed Feb 28, 2024
1 parent 12ba80e commit 437440d
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion .github/workflows/release-to-staging.yml
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ jobs:
git config user.name github-actions
git config user.email [email protected]
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 }} \
Expand Down

0 comments on commit 437440d

Please sign in to comment.