rebase-flow

What problem does it solve? Git rebase rewrites committed history and can cause unrecoverable accidents when run without state checks or recovery options. This Skill turns rebase into a fixed five-stage gate (context collection, plan presentation, user approval, backup plus execution, machine verification) so history rewriting never happens blindly. ## Core Features & Use Cases - Guardrail detection: A context script reports BLOCKER/WARNING conditions such as protected branches, dirty trees, in-progress operations, pushed commits, child branches, and conflict predictions before any rebase starts. - Backup-gated execution: A backup branch script creates a recovery point and unlocks a git-guard hook for 30 minutes, so rebase without a backup is mechanically blocked. - Machine verification: A verify script checks tree identity and range-diff after the rebase, and force-push is restricted to explicit --force-with-lease=<branch>:<sha> with separate approval. - Use Case: When asked to squash the last four commits and follow up with origin/main, the Skill splits this into two approved rebases, verifies tree identity after the squash, then rebases onto origin/main with conflict prediction. ## Quick Start Ask the assistant to rebase the current branch onto origin/main or squash recent commits, and it will run the context check, present a plan for approval, create a backup, execute, and verify the result.