Skills
.Work. You
Rest

mp-sync-base

Community

Safely merge a base branch into yours

Software Engineering#git#cli#merge#conflict resolution#stash#github workflows#branch sync
AuthorMartinoPolo
Version1.0.0
Installs0

System Documentation

What problem does it solve?

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.

Core Features & Use Cases

  • Target branch detection: Uses an explicitly provided branch argument, or falls back to a mp-base-branch-detector sub-agent to infer likely remote base branches.
  • Pre-merge safety checks: Detects uncommitted changes and prompts to stash; checks whether the current branch is behind, ahead, diverged, or in sync with its remote tracking branch.
  • Merge with conflict handling: Fetches and previews incoming commits, performs the merge, and guides resolution for conflicts using analysis of conflict markers and iterative resolution.

Quick Start

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.

Dependency Matrix

Required Modules

None required

Components

Standard package

💻 Claude Code Installation

Recommended: Let Claude install automatically. Simply copy and paste the text below to Claude Code.

Please help me install this Skill:
Name: mp-sync-base
Download link: https://github.com/MartinoPolo/mpx-claude-code/archive/main.zip#mp-sync-base

Please download this .zip file, extract it, and install it in the .claude/skills/ directory.
View Source Repository

Agent Skills Search Helper

Install a tiny helper to your Agent, search and equip skill from 471,000+ vetted skills library on demand.