merge-prep

merge-prep is a skill for Claude Code, Codex from sd0xdev/sd0x-harness. It costs 69 tokens per session (1,389 once invoked), scanned A, original, MIT.

A pre-merge analysis tool that compares a source Git branch with a target branch. It reports commit statistics, affected files, and likely conflicts, then suggests commands for a person to run.

In plain words
What is it for?
Use it to prepare a branch for merging, inspect which files may conflict, and get suggested manual commands for resolving or completing the merge.
Why use it?
It exposes merge risks before branches are combined. The analysis-only workflow leaves the actual merge, commit, and push under the developer's control.

Skill for Claude CodeCodex

Part of the sd0x-dev-flow plugin — 98 skills, 16 agents, 5 hooks shipped together

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.

agentmods
npx agentmods add skills/sd0xdev/sd0x-harness/merge-prep
Any agent
npx skills add sd0xdev/sd0x-harness --skill merge-prep
Clone the repo
git clone --depth 1 https://github.com/sd0xdev/sd0x-harness

Made for: Claude Code, Codex.

Or install sd0x-dev-flow, the plugin that ships this one along with the rest of its 98 skills, 16 agents, 5 hooks.

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.

agentmods badge for merge-prep

README.md
[![agentmods](https://agentmods.dev/badge/skills/sd0xdev/sd0x-harness/merge-prep.svg)](https://agentmods.dev/skills/sd0xdev/sd0x-harness/merge-prep)
Your own site
<a href="https://agentmods.dev/skills/sd0xdev/sd0x-harness/merge-prep"><img src="https://agentmods.dev/badge/skills/sd0xdev/sd0x-harness/merge-prep.svg" alt="Measured on agentmods" height="20"></a>
Per session 69 Skills are progressive disclosure: only the name and description are preloaded; the body loads when the skill is used.
When invoked 1,389 The whole file, excluding the scripts and references it only reads on demand.
Security scan A 0 findings. Scan, not verified.
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.

ModelPer sessionOnce invoked
Fable 5 $0.00069 $0.01389
Opus 5 $0.00034 $0.00694
Sonnet 5 $0.00014 $0.00278
Haiku 4.5 $0.00007 $0.00139

Measured 2d ago against content hash d8825cf56487, method: parsed. Prices are Anthropic first-party input rates as of 2026-08-30, from the pricing page.

Security

Grade A, and why

merge-prep 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 2d ago.

The scan reads SKILL.md. This mod also ships 1 executable file (scripts/pre-merge-check.sh), listed below but not scanned — reading those needs a real analyzer, not pattern matching.

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.

skills/merge-prep/SKILL.md · 200 lines

How it starts

The opening of the file, as written. The whole thing — 200 lines — stays where its author put it; the contents beside it link to each section on GitHub.

Merge Prep — Pre-merge Analysis and Preparation

Analyze source branch vs target branch, detect conflicts, output analysis report with suggested commands. v1 is analysis-only — does not execute merge/commit/push.

When NOT to Use

Scenario Use Instead
Commit code (not merge) /smart-commit
Merge to main (production) Manual PR flow
Just view diff git diff <target>..<branch>
Rebase or squash Manual operation

Input

/merge-prep <source-branch> [--target <branch>]

  • <source-branch>: Branch to merge (required)
  • --target: Target branch (default: {TARGET_BRANCH} or main)

Workflow

sequenceDiagram
    participant C as Claude
    participant U as User
    C->>C: Step 1: Validate prerequisites
    C->>C: Step 2: Pre-merge analysis
    C->>U: Show analysis report
    U->>C: Acknowledge
    C->>C: Step 3: Conflict analysis (if any)
    C->>U: Show conflict details + resolution suggestions
    C->>C: Step 4: Generate merge commands
    C->>U: Output commands for manual execution

Step 1: Validate Prerequisites

# 1a. Verify source branch exists
git rev-parse --verify <branch>

# 1b. Verify target branch exists
git rev-parse --verify <target>

# 1c. Verify working tree is clean
git status --porcelain
Check Failure Action
Branch doesn't exist Halt, list available branches
Target not found Halt, suggest creating it
Uncommitted changes Halt, suggest /smart-commit first

Step 2: Pre-merge Analysis

Run the analysis script:

bash skills/merge-prep/scripts/pre-merge-check.sh <branch> [target]

Script outputs JSON containing:

  • merge_base: Common ancestor
  • source_commits: New commits on source branch
  • target_commits: Commits on target that source doesn't have
  • has_conflicts: Whether conflicts exist
  • conflict_files: List of conflict files
  • file_stats: Affected file statistics

Display analysis report:

Read the full file on GitHub · 200 lines

Files

What ships with it

1 file beside SKILL.md in the same directory: the scripts, references and assets a skill reads on demand. Not counted in the per-session cost; read them before you install if any of them is executable.

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.

  1. 2d ago First seen · 200 lines · 69 tokens per session scan A d8825cf56487

Subscribe to this mod's changes

merge-prep is a skill published in the GitHub repository sd0xdev/sd0x-harness (188 stars, last pushed today), licensed MIT. It adds 69 tokens to every session and 1,389 once invoked, about $0.0003 per session on Opus 5. 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-09-03.

Related

Other skills, from other repositories

cc10x-router

THE ONLY ENTRY POINT FOR CC10X. Activate this skill for build, debug, review, and plan requests. Use when the user asks to implement, fix, review, plan, test, refactor, or continue code work. Trigger keywords: build, implement, create, write, add, review, audit, debug, fix, error, bug, broken, plan, design, architect…

romiluz13/cc10x · 125 tokens

building

Implementation skill for writing production code with TDD. Covers the RED-GREEN-REFACTOR cycle, false-RED detection, vertical slicing, scope escalation, test process discipline, and code generation patterns. Loaded by component-builder and bug-investigator.

romiluz13/cc10x · 53 tokens

diff-driven-docs

Use when a BUILD phase completes, a commit is staged, or a PR is about to be created, and the diff has not yet been reflected in documentation. Also use when the user says "update docs", "sync docs", "document this", or asks whether documentation is up to date.

romiluz13/cc10x · 64 tokens

exploration

Two-mode exploration skill: (1) design dialogue — turn rough ideas into validated designs through collaborative interview before planning; (2) spike — throwaway code answering ONE design question, deleted or absorbed, never shipped. Router invokes mode via dispatch context.

romiluz13/cc10x · 56 tokens

memory-and-handoff

Two-mode skill: (1) session memory — load/persist durable workflow state under .cc10x/ (activeContext, patterns, progress) so context survives compaction; (2) handoff package — portable, secrets-redacted export for a coworker, different tool, or fresh non-cc10x session.

romiluz13/cc10x · 70 tokens

plan-review-gate

Use after saving a non-trivial plan or decision RFC when a fail-closed feasibility, completeness, and alignment review must block execution.

romiluz13/cc10x · 32 tokens