Skip to content

Commit

Permalink
merge production to avoid force push (#9461)
Browse files Browse the repository at this point in the history
Signed-off-by: Matt Krick <matt.krick@gmail.com>
  • Loading branch information
mattkrick authored Feb 27, 2024
1 parent 55faa17 commit 1008578
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 @@ -99,7 +99,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 origin/production
git merge -s ours production
git push --set-upstream origin "release/v${{ env.ACTION_VERSION }}"
gh pr create \
--assignee ${{ github.actor }} \
Expand Down

0 comments on commit 1008578

Please sign in to comment.