Repository navigation
Recover from rebases the Stop hook leaves behind - #13
Merged
Merged
Conversation
- Roll back a pull that fails mid-rebase without a conflict, and name `mcs sync` when the commit-graph caused it - Turn off core.commitGraph per clone on every sync; doctor warns when it's on or auto-push is stuck - /resolve-memories clears an unfinishable rebase with --quit, keeping edits made since it started
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.
Why
A teammate's memory edits were stuck for two days. The Stop hook's
pull --rebasefailed partway on a blobless clone (git's commit-graph blocked a lazy fetch), left the rebase behind, and that paused every later Stop. Following /resolve-memories literally (--abort) would have wiped the pending edits.The hook now rolls back a rebase its own pull leaves, and says to run
mcs syncwhen the commit-graph is the cause. Sync turns the commit-graph off for each checkout, andmcs doctorwarns when it's on, or when auto-push is stuck on a rebase, a missing upstream or a misnamed file. /resolve-memories clears a rebase that can't be finished with--quit, keeping edits made since it started.Test plan
mcs syncon an existing checkout →git -C .claude/.memories-repo config core.commitGraphprintsfalsemcs doctor→ commit-graph warningmcs doctor→ warning naming /resolve-memories