rebase

What problem does it solve?

Rebase the current branch with smart conflict resolution to prevent manual merge conflicts and maintain a clean history.

Core Features & Use Cases

• Intelligent conflict handling that preserves changes from both sides and offers clear guidance for resolution
• Flexible argument handling: supports no-arg rebase onto main, "origin" forms (origin/main), specific origin branches, or local branches
• Automated fetch and rebase workflow with step-by-step conflict resolution suggestions
• Use Case: Rebase a feature branch onto main before merging to linearize history and simplify testing

Quick Start

Run the rebase skill to rebase your current branch onto main. Examples: rebase to rebase on main; rebase origin/feature to rebase on origin/feature; rebase origin/main to fetch and rebase onto origin/main.