repository-manager-merge-and-reconcile

repository-manager-merge-and-reconcile is a skill for Claude Code, Codex from Knuckles-Team/repository-manager. It costs 163 tokens per session (3,281 once invoked), scanned A, original, MIT.

A skill for merging a code branch into a shared repository when many other workers are merging changes at the same time. It uses a serialized merge queue, which processes one repository merge at a time, and helps resolve conflicts.

In plain words
What is it for?
Use it to enqueue, monitor and withdraw merges, validate repository checks, reconcile conflicts and assess the code that will exist after merging.
Why use it?
It lowers the risk of merging against an outdated codebase or misreading test failures caused by other branches.

Skill for Claude CodeCodex

Written for no agent in particular: nothing here depends on one.

Good fit Use it to enqueue, monitor and withdraw merges, validate repository checks, reconcile conflicts and assess the code that will exist after merging.

Compare 6 skills from other repositories ↓
Install with agentmods
npx agentmods add skills/knuckles-team/repository-manager/repository-manager-merge-and-reconcile
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.

Any agent
npx skills add Knuckles-Team/repository-manager --skill repository-manager-merge-and-reconcile
Clone the repo
git clone --depth 1 https://github.com/Knuckles-Team/repository-manager

Made for: Claude Code, Codex.

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 repository-manager-merge-and-reconcile

README.md
[![agentmods](https://agentmods.dev/badge/skills/knuckles-team/repository-manager/repository-manager-merge-and-reconcile/github.svg)](https://agentmods.dev/skills/knuckles-team/repository-manager/repository-manager-merge-and-reconcile)
Your own site
<a href="https://agentmods.dev/skills/knuckles-team/repository-manager/repository-manager-merge-and-reconcile"><img src="https://agentmods.dev/badge/skills/knuckles-team/repository-manager/repository-manager-merge-and-reconcile/github.svg" alt="Measured on agentmods" height="20"></a>

Or the 80×15 button, for a site that already has a row of RSS and ATOM ones. Only the verdict fits; the numbers stay here.

agentmods 80×15 button for repository-manager-merge-and-reconcile

Your own site · 80×15
<a href="https://agentmods.dev/skills/knuckles-team/repository-manager/repository-manager-merge-and-reconcile"><img src="https://agentmods.dev/badge/skills/knuckles-team/repository-manager/repository-manager-merge-and-reconcile.svg" alt="Reviewed on agentmods" width="80" height="20"></a>
Per session 163 Skills are progressive disclosure: only the name and description are preloaded; the body loads when the skill is used.
When invoked 3,281 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.

ModelPer sessionOnce invoked
Fable 5.1 $0.00163 $0.03281
Opus 5 $0.00081 $0.01640
Sonnet 5 $0.00033 $0.00656
Haiku 4.5 $0.00016 $0.00328

Measured 12d ago against content hash 1a9764e3e54a, method: parsed. Prices are Anthropic first-party input rates as of 2026-09-12, from the pricing page.

Security

Grade A, and why

repository-manager-merge-and-reconcile 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 12d 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.

repository_manager/skills/repository-manager-merge-and-reconcile/SKILL.md · 243 lines

How it starts

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

Repository Manager — Merge & Reconcile

Landing is the one operation a lane cannot do independently, so it goes through one serialized queue per repository. This skill is how to use it, and — the harder half — how to reconcile when what you wrote and what landed while you were writing it disagree.

When to use

  • A branch is ready to land.
  • A merge conflicts, or the queue rejected your candidate.
  • A gate is red and you must decide whether that failure is yours.
  • You need to know what a branch will actually do once merged.

When NOT to use

  • Opening/isolating/diagnosing a lane → repository-manager-lane-lifecycle.
  • Sweeping worktrees across the workspace → repository-manager-fleet-scale-operations.

The one path in

repository-manager --merge-queue enqueue --repo-path .        # offer the branch
repository-manager --merge-queue status  --repo-path .        # watch it
repository-manager --merge-queue config  --repo-path .        # validate the gates
repository-manager --merge-queue withdraw --repo-path . --queue-branch <b>

MCP: rm_merge_queue(action=…, repo_path=…). Standalone driver, suitable as a systemd/CronJob ExecStart: python -m repository_manager.merge_queue run --path <repo>.

Enqueued is not a to-do item. A scheduler drains every ~5 minutes: it gates the candidate as merged, fast-forwards the base, and prunes the worktree and the branch. Do not hand-merge because the queue feels slow — two lanes hand-merging is how a resolution gets orphaned.

Exit 75 (EX_TEMPFAIL) means another runner holds this repository's reconciliation-merge lease. Defer. Do not retry in a loop.

Mechanism vs gates — and why this matters to you

MECHANISM  (repository_manager/merge_queue.py — generic, one implementation)
  enqueue / status / withdraw / run / config     differential gating vs a base ref
  per-repo candidate store                       regenerate-on-land
  the reconciliation-merge lease                 guarded prune
  optimistic batching + bisection                fast-forward-only landing

GATES      (<repo>/.mergequeue.yaml — declarative, per project)
  a command, a tier, a timeout, and HOW to compare its result to the base

Read the full file on GitHub · 243 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. 12d ago First seen · 243 lines · 163 tokens per session scan A 1a9764e3e54a

Subscribe to this mod's changes

repository-manager-merge-and-reconcile is a skill published in the GitHub repository Knuckles-Team/repository-manager (2 stars, last pushed 15d ago), licensed MIT. It adds 163 tokens to every session and 3,281 once invoked, about $0.0008 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-08-31.