Rebase or merge a target branch into the current branch with conflict handling.
npx skills add https://github.com/MartinoPolo/mpx-claude-code --skill mp-rebase
Please help me install this Agent Skill. Skill: mp-rebase Source: https://github.com/MartinoPolo/mpx-claude-code/tree/main/_archive/skills-deprecated/mp-rebase Command: npx skills add https://github.com/MartinoPolo/mpx-claude-code --skill mp-rebase
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.
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.
Ask it to rebase your current branch onto a target branch named main using rebase mode.
High-intent search queries and answers about installing and using this skill.
When resolving merge conflicts during branch synchronization, the workflow detects conflicted files and guides you through resolving simple versus complex conflicts. It then executes git rebase continue or creates a merge commit to finalize the operation.
When resolving merge conflicts during a branch rebase, the workflow detects conflicted files and guides you through resolving simple versus complex conflicts. It then executes git rebase continue or creates a merge commit to finalize the operation.
Yes, you need a clean working tree before updating a feature branch. The workflow verifies your working tree is clean and checks ahead/behind divergence with the remote tracking branch before performing any merge or rebase operations.
The best way to integrate changes is to use an argument-driven workflow that fetches remote refs, detects the target branch, and evaluates branch divergence. It automatically chooses between git merge and git rebase based on the size of the divergence to ensure safe branch synchronization.
alexandersumerFetch and merge the origin default branch into the current local branch.
Spectra29115Resolve git rebase or merge conflicts through file inspection and editing.
rahulrajaramReport Git repository and submodule synchronization status against remote tracking branches.
JacobPEvansDiagnose Git rebase failures and recover from merge conflicts.
