mcpField
M
merge-branch

merge-branch

github.com/sjuneparkDevelopment160 installsUpdated 4w ago
Repository

About merge-branch

merge-branch is a skill for integrating branch work by treating Git's merge result as a draft to refine, audit, and validate. It supports planning, reviewing an existing merge, or performing an authorized integration, with safeguards for source branches.

Key features

  1. 01Dry-plan, audit, and integrate modes
  2. 02Clarify source and destination branches
  3. 03Refine and validate merge results
  4. 04Preserve source branch references

Use cases

  1. 01Planning a merge without changing repository state
  2. 02Auditing an existing merge result
  3. 03Integrating branch work and resolving conflicts
  4. 04Keeping the source branch unchanged during convergence

Install

Copy the command and run it in a terminal.

$npx skills add https://github.com/sjunepark/agent-scripts --skill merge-branch

After installing, type/merge-branchin Claude Code to confirm it loaded.

Bundled files

References and scripts installed along with SKILL.md.

agents/
openai.yaml
modes/
audit.md
dry-plan.md
integrate.md

Details

From the project README

Merge Branch

Integrate branch intent, not just patches. Prefer Git's merge machinery as a draft, then edit, refactor, audit, validate, and report the deliberate result.

Use clear branch terms: the destination receives the work and <source> supplies it. Establish both from the request and repository state before mutation; ask only when ambiguity remains about which branch should receive which work.

Choose One Mode

  • Dry plan: When the user asks to analyze or plan without changing repository state, read and follow modes/dry-plan.md. A plan-only request finishes with the plan and any unresolved decisions.
  • Audit: When the user asks to review a completed or in-progress merge result, read and follow modes/audit.md. Do not start or redo a merge unless separately authorized.
  • Integrate: When the user asks to perform a merge, transplant branch work, or resolve conflicts, read and follow modes/integrate.md through the authorized committed or uncommitted endpoint.

If the request combines assessment and integration, complete the read-only mode first, then perform the already authorized integration. Ask only for consequential decisions or authority still missing from the request and inspected evidence.

Shared Guardrail

Do not move, force-update, or delete the source branch automatically. Convergence means the source tip is reachable from destination HEAD; aligning branch refs requires explicit approval.

Comments

Markdown supported