feat: Conflicting backport without conflict annotations.#553
Merged
sorenlouv merged 10 commits intosorenlouv:mainfrom Feb 25, 2026
Merged
feat: Conflicting backport without conflict annotations.#553sorenlouv merged 10 commits intosorenlouv:mainfrom
sorenlouv merged 10 commits intosorenlouv:mainfrom
Conversation
… be retried with strategy=theirs resolution, to all effects generating backport PRs with the conflicts present not in the form of commmited conflict annotations
Distinguish from the existing `autoFixConflicts` callback by making the strategy explicit in the name. Made-with: Cursor
… are set CLI is already guarded by yargs `conflicts`, but config files can set both. Log a warning making the precedence explicit. Made-with: Cursor
- Capture the return value of the retry cherry-pick with --strategy-option=theirs and warn if it still has unresolved files. - Thread conflict info into the PR body so CI users have visibility into auto-resolved conflicts directly on the pull request. - When unresolved files remain after the retry, list them in the PR body. Made-with: Cursor
- Wrap cherrypickAbort in try/catch with a contextual BackportError so failures during abort produce a clear message. - Narrow strategyOption from string to 'ours' | 'theirs' to prevent misuse. Made-with: Cursor
Test the abort-and-retry flow in waitForCherrypick: - happy path: conflict -> abort -> retry with theirs -> success - retry still has unresolved files -> warning logged - both flags set -> warning logged - cherrypickAbort failure -> error propagates - clean cherry-pick -> no abort/retry Made-with: Cursor
Owner
|
Released in https://www.npmjs.com/package/backport/v/10.4.0 |
Owner
|
fyi: I ended up renaming the flag |
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
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.
Add "autoResolveConflictsWithTheirs" option making cherry-picks with conflicts to be retried with strategy=theirs resolution, to all effects generating backport PRs with the conflicts present not in the form of commmited conflict annotations.
Closes: #447
Rel: #550