Compatibility: Designed for Claude Code only. This skill uses hooks or ${CLAUDE_SKILL_DIR} which are not available on other platforms. Run on Claude Code or adapt before using elsewhere.

Safely rebase the current branch onto an updated base branch (typically main), using a pre-rebase intent snapshot to drive every conflict resolution correctly.

The core problem this skill solves

During git rebase main, conflict marker sides are counter-intuitive:

<<<<<<< HEAD (ours) = main's version (the base being rebased onto)
>>>>>>> {sha} (theirs) = your branch's commit being replayed

Claude (and humans) routinely pick the wrong side, silently discarding the branch's intended changes. This skill prevents that by capturing a full intent snapshot before the rebase starts, then using it as the ground truth for every conflict.

Usage

/dev:rebase              # rebase current branch onto origin/main (no push)
/dev:rebase main         # rebase onto a specific base branch (no push)
/dev:rebase --push       # rebase and push when done