If a cherrypick fails, PR with the conflicts for manual intervention #4853
+1
−0
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
MabezDev
added
skip-changelog
Contributor
There was a problem hiding this comment.
Pull request overview
Updates the backport workflow so that a backport PR is still created even when the cherry-pick results in conflicts, enabling manual intervention via a draft conflicts commit.
Changes:
- Configure
korthout/backport-actionto use the experimentaldraft_commit_conflictsconflict resolution mode.
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
bugadani
approved these changes
Jan 27, 2026
Co-authored-by: Copilot <[email protected]>
Contributor
There was a problem hiding this comment.
Pull request overview
Copilot reviewed 1 out of 1 changed files in this pull request and generated no new comments.
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
github-merge-queue
bot
removed this pull request from the merge queue due to failed status checks
Member
Author
|
Skip doesn't seem to work in the merge queue, cc @JurajSadel any ideas? |
github-merge-queue
bot
removed this pull request from the merge queue due to failed status checks
Contributor
|
We keep making the same mistake with labels and merge queues. Maybe we need a reusable workflow that can make them work |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I missed #4586 (comment) but luckily @bugadani caught it. This PR changes the backlog action to create the PR regardless of cherry pick success.