What problem does it solve?
This skill solves the friction of keeping feature branches up-to-date with a base branch by automating the rebase process, conflict resolution, and verification steps that typically require manual intervention.
Core Features & Use Cases
- Autonomous Conflict Resolution: Intelligently resolves merge conflicts by analyzing code intent from both the branch and the base, rather than just performing text-level merges.
- Verification Gate: Ensures code integrity by running project-specific tests or typechecks before finalizing any rebase or push.
- Safety-First Workflow: Implements force-with-lease pushing, automatic stash management, and a reset escape hatch to ensure no work is lost or overwritten.
Quick Start
Ask the agent to rebase the current branch onto the latest main branch and verify the changes.