Skip to content

If a cherrypick fails, PR with the conflicts for manual intervention #4853

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

Open
MabezDev wants to merge 2 commits into
base: main
Choose a base branch
from
+1 −0
Open

If a cherrypick fails, PR with the conflicts for manual intervention #4853

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9d6e44b
if a cherrypick fails, PR with the conflicts for manual intervention
MabezDev Jan 27, 2026
dfef8b1
Update .github/workflows/backport.yml
MabezDev Jan 27, 2026
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
1 change: 1 addition & 0 deletions .github/workflows/backport.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,3 +77,4 @@ jobs:
github_token: ${{ secrets.GITHUB_TOKEN }}
target_branches: ${{ steps.detect.outputs.target_branch }}
label_pattern: ".*-backport$"
experimental: "{\"conflict_resolution\": \"draft_commit_conflicts\"}"
Loading