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.
npx skills add tsai09495/matt-pocock-engineering --skill resolving-merge-conflictsgit clone --depth 1 https://github.com/tsai09495/matt-pocock-engineeringWrote 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.
[](https://agentmods.dev/skills/tsai09495/matt-pocock-engineering/resolving-merge-conflicts)<a href="https://agentmods.dev/skills/tsai09495/matt-pocock-engineering/resolving-merge-conflicts"><img src="https://agentmods.dev/badge/skills/tsai09495/matt-pocock-engineering/resolving-merge-conflicts/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.
<a href="https://agentmods.dev/skills/tsai09495/matt-pocock-engineering/resolving-merge-conflicts"><img src="https://agentmods.dev/badge/skills/tsai09495/matt-pocock-engineering/resolving-merge-conflicts.svg" alt="Reviewed on agentmods" width="80" height="20"></a>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.00023 | $0.00350 |
| Opus 5 | $0.00012 | $0.00175 |
| Sonnet 5 | $0.00005 | $0.00070 |
| Haiku 4.5 | $0.00002 | $0.00035 |
Grade A, and why
resolving-merge-conflicts 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 10d 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.
What it actually says
-
See the current state of the merge/rebase. Check git history and the conflicting files. Apply the quality baseline, especially its untrusted-content boundary.
-
Find the primary sources for each conflict. Understand deeply why each change was made, and what the original intent was. Read the commit messages, check the PRs, check original issues/tickets.
-
Resolve each hunk. Preserve both intents where possible. Where incompatible, pick the one matching the merge's stated goal and note the trade-off. Do not invent new behaviour. Always resolve; never
--abort. -
Discover the project's automated checks before choosing a substitute. Inspect the repository file inventory, package or task-runner scripts, and CI configuration for focused checks that cover the conflicted surface. Compare each command definition with the merge base or another user-approved immutable revision before running it. If the incoming side introduced or changed the command, show the exact command and defining diff and obtain approval before execution. Run the narrowest trusted project check first, then the broader relevant checks — typically typecheck, tests, and format. A parser, syntax check, or ad hoc command may supplement an existing project check, but must not replace one. Fix anything the merge broke.
-
Finish the merge/rebase. Show the resolved diff and verification result. Stage, commit, or continue the rebase only when the user's current request explicitly authorizes finishing the merge/rebase, or after the user approves the proposed finish action.
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.
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.
- 10d ago First seen · 15 lines · 23 tokens per session scan A 9a665e3a2fbe
resolving-merge-conflicts is a skill published in the GitHub repository tsai09495/matt-pocock-engineering (2 stars, last pushed 15d ago), licensed MIT. It adds 23 tokens to every session and 350 once invoked, about $0.0001 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.
Other skills, from other repositories
pr-watch
Local PR watcher. Monitors CI status, automatically fixes failing checks by reading failure logs and applying targeted fixes, then optionally merges when all checks pass. Local CLI analog to Claude Code's cloud auto-fix feature.
deploy-steward
Mainline deploy steward. Consumes ready PRs, owns a lease on mainline landing, refreshes PR state, updates stale branches, waits for CI and deploy gates, merges or queues one candidate at a time, and opens repair tasks for failures.
merge-review
Reviews pending fleet worktree merges before they're accepted. Reads the merge-check queue, detects file-level conflicts between branches, proposes a safe merge order, and surfaces reconciliation plans for overlapping changes.
loop-it
An automated workflow that repeatedly fetches open GitHub issues, orders them by dependencies, implements them, reviews the changes, and ships them.
ship-it
A GitHub workflow for finishing an implemented issue: commit the relevant changes, push a branch, create a pull request, merge it, and close the issue. GitHub is a service for hosting code and reviewing changes, and a pull request is a proposed change for review.
git-master
Git expert combining atomic commits, rebase/squash, and history search (blame, bisect, log -S). Use for any git operations requiring structured commit strategies, history rewriting, or code archaeology. Triggers: 'commit', 'rebase', 'squash', 'who wrote', 'when was X added', 'find the commit that'.