// Interactive rebase onto a base branch, resolving conflicts along the way and verifying tests pass. Compares against remote when done.
Review and merge open Dependabot pull requests
Evaluate pending (unsubmitted) review comments on the current branch's PR and, after user confirmation, address each in a separate sub-agent and separate commit.
Evaluate unresolved review comments on the current branch's PR and, after user confirmation, address each in a separate sub-agent and separate commit.
Walk through PR changes from the user's perspective. Traces each UI change through its full vertical slice — what the user sees, what it triggers, and how the server handles it. Use when asked to walk through what changed, review a PR, or summarize branch changes.
Run bin/claude-review --print and automatically fix all reported issues, committing each fix individually.
Amend a git commit further back in the history.
| name | rebase |
| description | Interactive rebase onto a base branch, resolving conflicts along the way and verifying tests pass. Compares against remote when done. |
| disable-model-invocation | true |
| user-invocable-only | true |
| allowed-tools | Bash, Read, Glob, Grep, Agent, Skill, AskUserQuestion |
| argument-hint | ["base-branch"] |
Rebase the current branch onto a base branch, resolving conflicts and verifying tests along the way.
Determine the base branch in this order:
$ARGUMENTS if the user specifies a branchbin/base-branch if the script exists and is executableFetch latest and begin the rebase:
git fetch origin
git rebase origin/<base-branch>
If the rebase completes with no conflicts, skip to Step 6.
git diff --name-only --diff-filter=Ugit addIf a conflict is ambiguous and you can't confidently determine the correct resolution, ask the user.
Run the tests related to the files that had conflicts. If tests fail due to the conflict resolution, fix them before proceeding.
If tests fail but seem unrelated to the rebase, verify by stashing and testing:
git stash
# run tests again
git stash pop
If you are unable to resolve test failures, let the user know what's broken and what you tried.
git rebase --continue
If there are more conflicts, go back to Step 3. Repeat until the rebase is complete.
Check if a remote tracking branch exists:
git rev-parse --verify @{u} 2>/dev/null
If a remote branch exists, run the /remote-diff skill to compare the rebase result against the remote and flag any potential issues.
If no remote branch exists, skip this step and report that the rebase is complete.