fix(git-repo): document clobbered-branch-pointer recovery in rebase-audit - #396
Open
DrumRobot wants to merge 1 commit into
Open
fix(git-repo): document clobbered-branch-pointer recovery in rebase-audit#396DrumRobot wants to merge 1 commit into
DrumRobot wants to merge 1 commit into
Conversation
…udit A botched interactive rebase can leave a batch of unrelated local branches pointing at the same wrong tip (single "Created from main" reflog entry, no prior history). Add a section covering detection, branch->PR-head reconciliation with content verification, and why main/primary branches must be repaired separately against origin, not bundled into the same reset --mixed batch.
DrumRobot
marked this pull request as ready for review
August 29, 2026 04:28
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.
Summary
A botched interactive rebase can leave a batch of unrelated local branches pointing at the same wrong tip (single "Created from main"-style reflog entry, no prior history). Adds a section to
git-repo'srebase-audit.mdcovering:main/primary branches are a separate case (targetorigin/main, not any single PR head)Test plan
es6kr/skillsreset from a shared bogus SHA back to their verified PR head SHAs