Skip to content

Commit

Permalink
ci: remove -x argument from cherry-pick
Browse files Browse the repository at this point in the history
The commit message already holds reference to the original PR, and this gets in the way of giving credit to all the people involved by breaking the `Co-Authored By` block.
  • Loading branch information
vitorhugods committed Jul 18, 2023
1 parent 48b43cf commit 8629614
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion .github/workflows/cherry-pick-rc-to-develop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
git fetch origin develop:develop
git checkout -b ${{ steps.extract.outputs.newBranchName }} develop
# Cherry-picking the last commit on the base branch
git cherry-pick -x ${{ github.event.pull_request.merge_commit_sha }} --strategy-option theirs || true
git cherry-pick ${{ github.event.pull_request.merge_commit_sha }} --strategy-option theirs || true
git add .
git cherry-pick --continue || true
git push origin ${{ steps.extract.outputs.newBranchName }}
Expand Down

0 comments on commit 8629614

Please sign in to comment.