A Claude Code skill that rebases your current feature branch onto the latest main, automatically resolving merge conflicts.
Install as a Claude Code skill, then use any of these triggers:
/rebase- "rebase my branch"
- "rebase onto main"
- "pull main into my branch"
The skill will fetch the latest primary branch, rebase your commits, resolve conflicts intelligently (asking you when ambiguous), run tests, and optionally merge back.