Merge a target branch into the current branch with Git safety checks.
npx skills add https://github.com/MartinoPolo/mpx-claude-code --skill mp-sync-base
Please help me install this Agent Skill. Skill: mp-sync-base Source: https://github.com/MartinoPolo/mpx-claude-code/tree/main/skills/mp-sync-base Command: npx skills add https://github.com/MartinoPolo/mpx-claude-code --skill mp-sync-base
Keeps a feature or working branch up to date by merging changes from a target branch (such as main or dev) while preventing surprises from uncommitted work, missing tracking branches, or upstream divergence.
mp-base-branch-detector sub-agent to infer likely remote base branches.Run mp-sync-base to merge the target branch (for example, main) into your current branch while it checks status, sync state, and resolves conflicts if needed.
High-intent search queries and answers about installing and using this skill.
To merge a base branch safely, the process fetches remote updates, previews incoming commits, and runs pre-merge checks for uncommitted work. It then executes the branch merge and guides you through conflict resolution using marker analysis.
When syncing a feature branch with main, pre-merge safety checks detect uncommitted changes and prompt you to stash them. This prevents losing local work before fetching and executing the upstream merge.
To resolve merge conflicts after pulling updates, the process analyzes Git conflict markers and provides iterative resolution guidance. This helps you systematically address divergent code sections introduced during the branch sync.
You need a tracking remote configured to automatically push the merge result after syncing upstream changes. The process checks whether your branch is ahead, behind, or diverged from its remote tracking branch before executing the merge.
You can automatically detect the target branch when merging dev into a feature branch by falling back to a base-branch detector. This sub-agent infers the likely remote base branch if you do not explicitly provide one as an argument.
The best way to preview incoming commits before merging main into your working branch is to use a Git workflow that fetches the remote and displays the commit log. This lets you review upstream changes before executing the actual merge.
denniscalazansReset the Git working directory to the main branch safely.
mixomatDelete local git branches marked [gone] while skipping worktree branches.
lklimekAutomate Git merges with conflict resolution and behavioral change reports.
bmsull560Resolves git rebase conflicts in feature branches via guided marker resolution.