feat(fork-stack): auto-rebase open feature PRs + smart local pull#50
Merged
Merged
Conversation
When the stack rewrites fork/changes, also force-with-lease rebase every open PR that targets it (conflicts are skipped and summarized). Add `pnpm fork:stack pull` for local checkouts after remote rewrites: hard-reset when local commits are patch-equivalent to remote, otherwise rebase unique unpushed work. Fix gh --json parsing under FORCE_COLOR.
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/changes, also force-with-lease rebase every open feature PR that targets it (conflicts are skipped + reported in the job summary).pnpm fork:stack pullfetches the remote tip and usesgit cherrypatch-ids — hard-reset when local commits are equivalent to the rebased remote; only rebase when you have unique unpushed work.pnpm fork:stack update --pushkeeps feature PRs based onfork/changes(rebase / replay / retarget wrong bases). Docs + AGENTS updated so PRs are not opened against the upstreammainmirror.gh --jsonparsing under agentFORCE_COLORhosts.Test plan
vp test run scripts/fork-stack.test.ts scripts/rebase-pr-stack.test.ts(29 passed)pnpm fork:stack pullresets cleanly when no unique local patchespnpm fork:stack pullrebases it onto remote