stack-cascadelisted

Safely propagate a base-branch commit through all descendant branches in a stacked-PR chain. Handles safety-tagging, `git rebase --update-refs --empty=drop` from the tip, conflict-resolution heuristics, dependency-drift recovery, and `--force-with-lease` push. Use when landing a fix on an upstream branch in a stack and the descendants must be rebased. Covers scenarios like: 'cascade through the stack', 'rebase pr6..pr13 onto the new pr5', 'land on the base and propagate', 'update the descendant branches', 'restack onto the new base', 'force-with-lease the whole stack', 'fix the base and roll the stack forward'. Pairs with `/rebase-validate` for post-cascade meaning-preservation check.
voxpelli/claude-git · ★ 0 · AI & Automation · score 76

Install: claude install-skill voxpelli/claude-git

# Stack Cascade — propagate a base-branch fix through a PR stack Land a commit on a base branch in a stacked-PR chain, then mechanically propagate the change through every descendant with safety tags, conflict resolution, dependency refresh, and a single force-with-lease push. Companion to `/rebase-validate` (which *checks* a cascade preserved meaning). Run this skill to *execute* the cascade, then `/rebase-validate` to verify. ## When to Use - A fix has just been (or is about to be) committed on a base branch and every dependent branch needs to be rebased onto the new tip. - You're working on a stack like `feature/pr1 → feature/pr2 → … → feature/prN`, each rebased onto the previous, with `--update-refs` ergonomics. - The cascade involves more than a trivial fast-forward (i.e. real risk of conflict, dropped commits, or post-rebase regressions). (For the inverse — what this skill is NOT for — see "When NOT to Use" at the bottom.) ## Preconditions - The fix-commit on the base branch is committed AND validated individually (the base branch passes its own CI suite). Authoring + base-validation are manual; this skill kicks in for the propagation. - Working tree is clean (`git status --short` returns nothing). - You have the full ordered list of branches in the stack. ## Step 1 — Verify the worktree HEAD Session prompts and IDE chrome can lie about which branch is checked out, especially across reused worktrees. Verify before tagging: ```bash git rev-parse --abb