auto-backport: fix conflict_resolution to use experimental input#15907
Open
rpcme wants to merge 1 commit into
Open
auto-backport: fix conflict_resolution to use experimental input#15907rpcme wants to merge 1 commit into
rpcme wants to merge 1 commit into
Conversation
The conflict_resolution option is nested inside the 'experimental' JSON input, not a top-level input. The previous configuration was silently ignored, causing backports with cherry-pick conflicts to be skipped entirely instead of creating draft PRs. This primarily affected wrynose-next which has older recipe versions than master-next.
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
The
conflict_resolutionoption must be nested inside theexperimentalJSON input forkorthout/backport-action@v4. The previous top-level config was silently ignored, causing backports with cherry-pick conflicts (rename/rename from version upgrades) to be skipped entirely.This is why wrynose-next has not been receiving recipe upgrades — its base versions differ from master-next, so cherry-picks conflict, and without proper conflict resolution the backport is simply dropped.
With this fix, conflicting backports will create draft PRs with the conflicts committed, allowing manual resolution instead of silent failure.