rebase-origin-main

What problem does it solve?

Rebasing a feature branch onto origin/main can introduce conflicts and uncertainty. This Skill provides a guided, repeatable workflow to rebase onto origin/main and resolve conflicts one by one until a clean history is achieved.

Core Features & Use Cases

• Fetches latest origin/main and rebases the current branch onto it
• Detects conflicts and guides deterministic resolution to preserve the intended changes
• Warns about common pitfalls in rebases (e.g., inverted ours/theirs labels) and ensures correctness across commits
• Use Case: When your feature branch has diverged from main and you want to integrate the latest changes without losing work

Quick Start

Initiate the workflow to rebase your current branch onto origin/main and resolve conflicts progressively until the rebase completes.