Menü
Rebase a chain of stacked/dependent branches when main is updated.
Mit Codex oder Claude installieren Kopieren Sie diesen Prompt, fügen Sie ihn in Codex, Claude oder einen anderen Assistant ein und lassen Sie die Skill-Seite prüfen und installieren.
Basierend auf der SOC-Berufsklassifikation
Capture session learnings and save to skills, guidelines, or reference docs under ~/.claude/.
Orchestrate parallel claude -p sessions — bootstrap, launch, monitor, and converge. Works with any skill that produces manifest.json, item directories, and a runner script.
Create a request (pull request or merge request) or update an existing one following project conventions.
Resolve merge or rebase conflicts between branches.
Assess open PRs with unaddressed review comments and generate a parallel addressing script — produces manifest.json and let-it-rip.sh for address-request-comments execution.
Assess open work items and generate a parallel execution script — produces manifest.json and let-it-rip.sh for implement/clarify execution.
| name | cascade-rebase |
| description | Rebase a chain of stacked/dependent branches when main is updated. |
git branch --show-current 2>/dev/nullRebase a chain of compound feature branches when the base (main) is updated.
/cascade-rebase <branch1> <branch2> ... - Rebase branches in order/cascade-rebase - Will prompt for branch chainGet branch chain:
$ARGUMENTS provided, parse as space-separated branch namesfeature/phase1 feature/phase2 feature/phase3)"Fetch and validate:
git fetch origin main <all-branches>
Verify all branches exist.
Record current commit hashes (needed for --onto):
git rev-parse origin/<branch>
Store as old_hash_<branch> for each branch.
Rebase first branch onto main:
git checkout <branch1>
git rebase origin/main
Record new hash: new_hash_<branch1>=$(git rev-parse HEAD)
Cascade to subsequent branches: For each remaining branch:
git checkout <branchN>
git rebase --onto <new_hash_prev> <old_hash_prev> <branchN>
Record: new_hash_<branchN>=$(git rev-parse HEAD)
The --onto syntax:
<new_hash_prev>: Where to attach (tip of rebased previous branch)<old_hash_prev>: Old parent to detach from<branchN>: Current branch being rebasedHandle conflicts:
git rebase --continuegit rebase --abortPush all branches: Ask the operator: "Rebase complete. Push all branches with --force-with-lease?"
git push origin <branch1> --force-with-lease
git push origin <branch2> --force-with-lease
# ... etc
Summary: Show old → new commit hashes for each branch.
Cascade rebase: main → feature/phase1 → feature/phase2 → feature/phase3
Step 1: Rebasing feature/phase1 onto main...
Done: abc123 → def456
Step 2: Rebasing feature/phase2 onto feature/phase1...
Done: 111aaa → 222bbb
Step 3: Rebasing feature/phase3 onto feature/phase2...
Done: 333ccc → 444ddd
All branches rebased. Ready to push.
--force-with-lease (not --force) for safety