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 risadams/ink-and-agency --skill branch-resolve-conflictsgit clone --depth 1 https://github.com/risadams/ink-and-agencyWrote 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/risadams/ink-and-agency/branch-resolve-conflicts)<a href="https://agentmods.dev/skills/risadams/ink-and-agency/branch-resolve-conflicts"><img src="https://agentmods.dev/badge/skills/risadams/ink-and-agency/branch-resolve-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/risadams/ink-and-agency/branch-resolve-conflicts"><img src="https://agentmods.dev/badge/skills/risadams/ink-and-agency/branch-resolve-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.00050 | $0.00546 |
| Opus 5 | $0.00025 | $0.00273 |
| Sonnet 5 | $0.00010 | $0.00109 |
| Haiku 4.5 | $0.00005 | $0.00055 |
Grade A, and why
branch-resolve-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.
The source is not reproduced here
A licence we could not identify
The repository carries a LICENSE file, but it is custom or dual enough that GitHub cannot name it and neither can this catalogue. Unknown terms are not permission, so the body is not copied here. Read the licence at the source and decide for yourself.
What ships with it
3 files 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.
- 11d ago First seen · 52 lines · 50 tokens per session scan A 4640d3fe7101
branch-resolve-conflicts is a skill published in the GitHub repository risadams/ink-and-agency (2 stars, last pushed 1mo ago), with no licence file. It adds 50 tokens to every session and 546 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-08-31.
Other skills, from other repositories
checkin-assistant
A checklist for the steps before making a Git commit. It treats a commit as one complete, reversible unit of work that should leave the codebase working.
changelog-guide
A guide for maintaining a CHANGELOG.md file, which records notable changes made in each software release. It follows the Keep a Changelog format and groups changes such as additions, updates, and fixes.
commit-standards
Format commit messages following conventional commits standard. Use when: writing commit messages, git commit, reviewing commit history. Keywords: commit, git, message, conventional, feat, fix, refactor.
git-workflow-guide
A guide for managing Git branches and merges, including branch names and common team workflows. Git is a system for tracking code changes and combining work from different branches.
release-standards
A guide for preparing software releases with semantic versioning and changelogs. Semantic versioning uses major, minor, and patch numbers to describe the kind of change in a release.
resolving-merge-conflicts
Use when you need to resolve an in-progress git merge/rebase conflict.