Repository navigation
Post the conflict re-parent in plain git instead of uvx git-merge-onto - #68
Merged
Merged
Conversation
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Phlogistique
changed the title
Phlogistique
marked this pull request as ready for review
November 9, 2026 10:24
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. It now posts the same re-parent in plain git: merge a throwaway commit that has the target's content and both the target and the parent branch as parents. Git then merges from the same base that git-merge-onto forces, so the result is the same: one round of conflicts, rebase merges work, and the child's changes are kept.
The obvious plain-git recipe,
git merge origin/<parent>thengit merge origin/<target>, merges from an older base. It raises conflicts on lines the parent changed, and silently undoes some child changes, for example a deletion of a line the parent added.