What is m-merge-branch?

An automated Git workflow for merging a named branch, pull request, or Git URL into the current project.

It fetches branches, identifies conflicts, combines changes, removes conflict markers, builds the result, runs tests, and commits when verification succeeds.

It checks merge feasibility and helps resolve conflicts while preserving stable code and added feature logic.

m-merge-branch — Command for Claude Code by penwyp

Install

Getting it into your agent

One page per mod, every tool's command on it. A separate URL per tool would split the same page into five that compete with each other.

Clone the repo

git clone --depth 1 https://github.com/penwyp/ClaudePreference

Made for: Claude Code.

Wrote this? Show the measurements

A badge with what this costs and how it scanned, read live from this page, so it follows the numbers instead of freezing them. Markdown for a README, HTML for a documentation site or a project page.

README.md

[![agentmods](https://agentmods.dev/badge/commands/penwyp/claudepreference/m-merge-branch.svg)](https://agentmods.dev/commands/penwyp/claudepreference/m-merge-branch)

Your own site

<a href="https://agentmods.dev/commands/penwyp/claudepreference/m-merge-branch"><img src="https://agentmods.dev/badge/commands/penwyp/claudepreference/m-merge-branch.svg" alt="Measured on agentmods" height="20"></a>

Per session 0 Only the description is in the session, so the agent can decide to use it. The body loads when it is invoked.

When invoked 314 The whole file, excluding the scripts and references it only reads on demand.

Security scan A 0 findings. A grade says what 26 rules found in the file — not that it is safe.

Origin original No closer match found in the catalogue.

Token cost

What it costs to keep this loaded

Counted locally with the o200k_base tokenizer, which is exact for GPT models; Claude uses its own tokenizer and its counts differ. Treat this as one consistent yardstick across the catalogue rather than a bill. Prices are per million input tokens.

Model	Per session	Once invoked
Fable 5.1	$0.00000	$0.00314
Opus 5	$0.00000	$0.00157
Sonnet 5	$0.00000	$0.00063
Haiku 4.5	$0.00000	$0.00031

Measured 8d ago against content hash 5a3d0c11a107, method: parsed. Prices are Anthropic first-party input rates as of 2026-09-07, from the pricing page.

Security

Grade A, and why

m-merge-branch scanned grade A with 0 findings against 26 rules in 11 categories — prompt injection, anti-refusal, data exfiltration, privilege escalation, supply chain, agent snooping, system-prompt leakage, SSRF and excessive agency — measured 8d ago.

A static scan of the body, not an audit. Every finding is printed with the line that produced it so you can judge whether it matters here. A mod is markdown that instructs an agent; that is exactly why what it instructs is worth reading.

Nothing flagged

None of the 26 patterns this scan looks for appear in this file: no shell pipes, no recursive deletes, no credential paths, no hidden text, no instruction-override or anti-refusal phrasing, no agent-config snooping. That is not a guarantee, it is the absence of the things that are checkable.

commands/m-merge-branch.md · 43 lines

What it actually says

Auto Merge Workflow: Analyze, Merge, Resolve, Test, Commit

Merge target: $BRANCH_NAME

⚠️ If no branch is specified, abort immediately with error: Error: No branch specified. Please provide a valid target branch for merge.

Supported inputs: branch name (feature/login-api), pull request number (#456), or git URL.

Commands:

Analyze merge feasibility
- Fetch latest main and target branch.
- Detect merge conflicts and list affected files.
- Assess potential risk areas (e.g., core logic, config files).
Merge branches with conflict resolution
- Automatically merge the branches.
- For each conflict:
  - Prefer main for stability.
  - Merge feature logic if it adds functionality or fixes.
  - Avoid overwriting configs or key functions blindly.
  - Use semantic understanding to combine logic reasonably.
Resolve and clean up conflicts
- Remove conflict markers.
- Ensure all merged code is syntactically correct and logically complete.
- Keep imports, function signatures, and references intact.
Build and test verification
- Ensure full compilation success. Abort if build fails.
- Run automated tests to catch regressions.
- No unverified merge is allowed to proceed.
Finalize commit
- Complete the merge with a clean commit message.
- Do not push or report. Only prepare for further review or next step.

Changes

What this file has done since we first saw it

Hashed on every crawl. A supply-chain change to an agent config is a question of when, not whether, so the history is kept rather than the latest state alone.

8d ago First seen · 43 lines · 0 tokens per session scan A 5a3d0c11a107

Subscribe to this mod's changes

m-merge-branch is a command published in the GitHub repository penwyp/ClaudePreference (137 stars, last pushed 3mo ago), licensed MIT. It costs nothing until one of its globs matches a file; then it loads 314 tokens. A static security scan graded it A with 0 findings. No closer match exists in the catalogue, so it is treated as the original; first seen 2026-08-30.

Git and workflow

commit

A command that examines staged Git changes and proposes a commit message using the Conventional Commits format, such as feat, fix, or docs. Git is a tool for tracking changes to code.

echoVic/blade-code · 8 tokens

release-notes

Generate consistent, well-structured release notes from git history. Triggered on release tags following semver patterns (v..) to produce categorized changelog with breaking changes, features, fixes, and contributor attribution.

OpenHands/extensions · 44 tokens

doctor

Diagnosticar y reparar problemas del framework Don Cheli, git y entorno. Usa cuando el usuario dice "doctor", "problemas del framework", "don cheli no funciona", "repair Don Cheli", "debug setup", "setup broken", "framework broken", "reparar entorno". Detecta y repara issues de configuración, git y dependencias…

doncheli/don-cheli-sdd · 76 tokens

m-merge-branch