Smooth Rebase

Rebase the current branch onto the repository's default branch, resolving conflicts along the way. Preserve intent, avoid silent guesses, and ask the user whenever the correct resolution is not clearly supported by the code or surrounding context.

Behavior

The skill follows one simple rule:

1. If a rebase is already in progress (conflicted or paused), do not start anything new. Resolve the current conflicts, continue the rebase, and repeat until it completes.
2. Otherwise, detect the repository's default branch (main, master, or whatever the remote declares), fetch it, and rebase the current branch onto it — resolving any conflicts that arise until the rebase completes.

Scope

Use this skill when the user wants to bring a branch up to date or finish a conflicted rebase, including requests like:

• "rebase this branch"
• "rebase onto main"
• "fix PR conflicts"
• "continue the rebase and fix the conflicts"