Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add force cherry-pick command #101

Merged
merged 1 commit into from
Sep 20, 2023
Merged

Add force cherry-pick command #101

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/pr.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ jobs:
git checkout -b ${BACKPORT_BRANCH_NAME}

# Force cherry-pick. The conflicts will be modified within the backport PR.
git cherry-pick $GITHUB_SHA
git cherry-pick $GITHUB_SHA || (git add -A && git cherry-pick --continue --no-edit)
git push origin ${BACKPORT_BRANCH_NAME}

gh pr create --base ${BRANCH_NAME} \
Expand Down
Loading