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 gtapps/hermitd --skill resolving-merge-conflictsgit clone --depth 1 https://github.com/gtapps/hermitdWrote 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/gtapps/hermitd/resolving-merge-conflicts)<a href="https://agentmods.dev/skills/gtapps/hermitd/resolving-merge-conflicts"><img src="https://agentmods.dev/badge/skills/gtapps/hermitd/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/gtapps/hermitd/resolving-merge-conflicts"><img src="https://agentmods.dev/badge/skills/gtapps/hermitd/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.00242 |
| Opus 5.5 | $0.00009 | $0.00097 |
| Sonnet 5.5 | $0.00005 | $0.00048 |
| Haiku 4.5 | $0.00002 | $0.00024 |
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 11d 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.
This is a copy
81% identical to resolve-merge-conflict — 14 lines differ, which has more behind it and is treated as the original. This page carries a canonical link to it rather than competing with it.
What it actually says
-
See the current state of the merge/rebase. Check git history, and the conflicting files.
-
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 and run them — typically typecheck, then tests, then format. Fix anything the merge broke.
-
Finish the merge/rebase. Stage everything and commit. If rebasing, continue the rebase process until all commits are rebased.
Adapted from mattpocock/skills (MIT, Copyright 2026 Matt Pocock)
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.
- 11d ago First seen · 19 lines · 23 tokens per session scan A 592d399df070
resolving-merge-conflicts is a skill published in the GitHub repository gtapps/hermitd (79 stars, last pushed today), licensed MIT. It adds 23 tokens to every session and 242 once invoked, about $0.0001 per session on Opus 5.5. A static security scan graded it A with 0 findings. It is 81% identical to resolve-merge-conflict, differing in 14 lines, and is treated as a copy.
Other skills, from other repositories
release
Bump a plugin's version, write a detailed changelog entry for the upgrade skill to consume, and commit+push. Takes a plugin slug argument identifying which plugin under plugins/ to release. Use this skill whenever the user says "release", "version bump", "cut a release", "changelog and push", or finishes a set of…
fleet-release
Use this skill whenever the user wants to release, ship, prep, or cut versions for two or more plugins together on the current branch. Trigger on phrasings like "release both plugins", "ship them together", "release all changed plugins", "fleet release", "multi-plugin release", "release in order", or "release…
atlas-changelog
Maintain per-repo and cross-repo changelogs — append structured entries after agent work. Use when asked to "log this change", "update changelog", "what changed", "change history".
release-status
Use this skill to answer "what's ready to ship?", "where does the release pipeline stand?", "any plugins awaiting tag?", or "give me a pipeline overview". Shows plugin versions, tags, commits ahead, unreleased changes, and core compatibility. Read-only.
apex-status
CTO-level project status from git and codebase state. Use when asked "where are we", "project status", "what's done", or at the start of a work session.
secrets-scan
Scans git-tracked files for leaked secrets. Triggers - secrets scan, find credentials, leaked keys, security audit.