docs(skill): document the stacked-PR teardown flow - #52
Merged
Conversation
Reflect the stacked-PR work (#48-#51) in the skill's stacking section: gw sync restacks with rebase --onto (replaying only the child's commits, not the merged parent's), gw status guides the pre-PR case, and gw cleanup keeps a base branch alive while an open child PR still targets it. Adds a note on why --onto is required after a squash merge. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
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.
What
Reflect the stacked-PR package (#48–#51) in the
git-workflowskill's stacking section:gw syncrestacks withgit rebase --onto— replays only the child's commits, not the merged parent's — moves the PR base tomain, force-pushes.gw statusguides the pre-PR case (parent merged before the child got a PR) togit rebase --onto origin/main <recorded-base>.gw cleanupkeeps a base branch alive while an open child PR still targets it (deleting it would make GitHub close that PR).--ontois required after a squash merge (a plain rebase double-applies the parent's commits).Why
Keep the skill — the single source of truth for the gw workflow — in step with the shipped behavior, so the stacked flow (create → sync → cleanup) is documented end to end.
🤖 Generated with Claude Code