Reword conflict comment to avoid retargeting confusion#31
Merged
Phlogistique merged 1 commit intomainfrom Apr 8, 2026
Merged
Conversation
The prior wording ("I will pick-up from there and continue retargetting")
risked reinforcing the idea that users might need to run `gh pr edit --base`
themselves. It also oversold the scope — only the commented PR is resumed,
not "the stack".
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.
Adds a trailing sentence to the merge-conflict PR comment reassuring the reader that they only need to push their conflict resolution. Without it, a reader might assume they also need to run
gh pr edit --basethemselves, which would not work because the synthetic merge commit would not be produced.