fix(fork-stack): cherry-based transplant for multi-generation PR resync#52
Merged
Merged
Conversation
When fork/changes is rewritten, do not replay the full GitHub PR commit list. Use patch-id uniqueness (git cherry), oldest-first cherry-picks, and auto-skip large conflicting layer commits so multi-generation drift can resync safely. Cascade uses the same fallback after rebase --onto.
patroza
force-pushed
the
t3-discord/fork-stack-cherry-replay
branch
from
July 25, 2026 14:37
8eb55a1 to
32f6950
Compare
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
1 participant
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
fork:stack updateno longer cherry-picks the full GitHub PR commit list (that re-applied obsolete private-layer bootstraps and conflicted on feat(import): restore external agent sessions #41).fork/changesrewrites) usesgit cherryunique patches, oldest-first.rebase --ontowhen the previous tip is an ancestor, then falls back to the same cherry transplant instead of skipping with “needs manual replay”.Test plan
vp test run scripts/fork-stack.test.ts scripts/rebase-pr-stack.test.ts(31 passed)pnpm fork:stack update --push <pr>on a multi-generation diverged feature PR--ontodoes not apply