rebase

Purpose

Resumes a paused rebase that stopped on a conflict hunk. The conductor's finish-time runRebaseStep calls this skill when git rebase exits mid-flight (exit code 1 with conflict markers in the working tree). The operator can also invoke it manually as /rebase.

This skill has ONE job: resolve the conflict markers in the affected files, stage the fixes, and run git rebase --continue to advance — repeating for any additional conflict hunks — until the rebase completes cleanly or a hunk is judged unsafe to resolve automatically.

The conductor retries this skill up to a configured cap (default 3) before issuing a HALT. Each invocation is one bounded attempt.

Practices

1. Confirm Rebase State

Verify a rebase is actually in progress before touching anything:

git status
test -d "$(git rev-parse --git-path rebase-merge)" || test -d "$(git rev-parse --git-path rebase-apply)"

(--git-path resolves the state dir correctly in linked worktrees, where .git is a file and ls .git/rebase-merge/ always fails. Note that rev-parse --git-path prints the path unconditionally — only test -d on it proves a rebase is in progress.)

If no rebase is in progress, emit {"resolved": false, "reason": "no rebase in progress"} and stop.

2. Capture Replay Intent Before Editing

Before touching a conflicted file, capture an evidence ledger for the replay source commit currently being applied. REBASE_HEAD identifies the commit being replayed during a paused rebase; record its object ID and its parent commit before making edits:

git rev-parse REBASE_HEAD
git rev-parse REBASE_HEAD^
git show --format=fuller --stat REBASE_HEAD
git diff --find-renames REBASE_HEAD^ REBASE_HEAD

Read the source commit and its parent context/diff to establish what behavior the replay source commit intended to introduce or change. Then read the upstream context that is currently checked out and caused the conflict:

git show --format=fuller --stat HEAD
git log --oneline --decorate -n 20 HEAD
git diff --find-renames REBASE_HEAD^ HEAD