migrate shadow branch if base commit changed after pull/rebase#39
Merged
gtrrz-victor merged 1 commit intosoph/multi-sessionfrom Jan 13, 2026
Merged
Conversation
Entire-Checkpoint: 0a31ea1143de
Soph
force-pushed
the
soph/shadow-branch-migration
branch
from
398b7ff to
a88ed15
Compare
gtrrz-victor
approved these changes
Jan 13, 2026
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
2 participants
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.
Found / noticed this when working on #32
If user does stash → pull → apply, HEAD changes but the shadow branch is left at the old commit, orphaning checkpoints. This PR addresses this that when base commit changes and old shadow branch exists (meaning user didn't commit), move the shadow branch to the new commit.