mp-rebase

What problem does it solve?

This Skill helps you integrate changes from another branch into your current branch by automatically choosing rebase or merge and handling the common failure points that cause conflicts or broken histories.

Core Features & Use Cases

• Argument-driven rebase vs merge: Defaults to rebase, but switches to merge mode when requested or when the rebase appears too large.
• Branch detection and sync checks: Detects the target branch (or asks you to choose), verifies a clean working tree, and checks ahead/behind/divergence with the remote tracking branch.
• Conflict-aware resolution workflow: Detects conflicted files, guides you through resolving simple vs complex conflicts, and continues the operation (rebase continue / merge commit).

Use case: You want to “rebase on main” after a long-lived work branch has drifted, without accidentally rebasing with local changes or getting surprised by divergence and large commit sets.

Quick Start

Ask it to rebase your current branch onto a target branch named main using rebase mode.