rebase

# Rebase workflow Move the branch onto its base, then establish that what came out is right. A guard hook runs alongside. It refuses a rebase started by hand and a continue past a conflict git never checked. It also refuses a dropped commit that isn't empty, a bare stash pop, and a force push without a lease. ## Preflight !`bash ${CLAUDE_SKILL_DIR}/scripts/preflight.sh` ## Step 0: open the task list Create these with `TaskCreate`, then move each through `in_progress` and `completed`. 1. Choose the base 2. Settle the working tree 3. Start the rebase 4. Resolve whatever it stops on 5. Verify the result 6. Report Preflight reporting a merge or cherry-pick in progress stops everything. Say what's in the way and hand back. A rebase already in progress is the other case, and that one resumes at step 4. ## Step 1: choose the base Preflight computed this under `== rebase base ==`. Take its recommendation. - Local default branch carries everything the remote has, so rebase onto the local branch. - Local default branch sits behind the remote, so rebase onto `origin/<default>` and skip the stale local copy. The `commit` skill's preflight makes the same decision, and both reach the same answer. Where the operator names a different base, use theirs and say why it differs. Nothing to replay means nothing to do. Say so and stop. ## Step 2: settle the working tree `--autostash` handles a dirty tree, and `start-rebase.sh` passes it. It scopes the save to this rebase and never t...