Repository navigation
Post two plain merges in the conflict comment instead of git-merge-onto - #68
Draft
Phlogistique wants to merge 1 commit into
Draft
Phlogistique wants to merge 1 commit into
Phlogistique wants to merge 1 commit into
Conversation
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
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
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 comment made people pull git-merge-onto to resolve a conflict. It now asks for two plain merges: the parent branch, then the target. The action itself still uses the vendored copy when there is no conflict.
The cost is a second merge commit, and if the child edited its parent's lines, the same conflict comes up in both merges.
Known limit: if the child deleted a line its parent added,
git merge origin/<target>brings the line back without a conflict. git-merge-onto kept it deleted. I reproduced this locally; it has not been seen in production.