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 iowarp/clio-kit --skill clio-kit-resolve-merge-conflictsgit clone --depth 1 https://github.com/iowarp/clio-kitWrote 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/iowarp/clio-kit/clio-kit-resolve-merge-conflicts)<a href="https://agentmods.dev/skills/iowarp/clio-kit/clio-kit-resolve-merge-conflicts"><img src="https://agentmods.dev/badge/skills/iowarp/clio-kit/clio-kit-resolve-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/iowarp/clio-kit/clio-kit-resolve-merge-conflicts"><img src="https://agentmods.dev/badge/skills/iowarp/clio-kit/clio-kit-resolve-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.00076 | $0.01842 |
| Opus 5.5 | $0.00030 | $0.00737 |
| Sonnet 5.5 | $0.00015 | $0.00368 |
| Haiku 4.5 | $0.00008 | $0.00184 |
Grade A, and why
clio-kit-resolve-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 9d 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.
How it starts
The opening of the file, as written. The whole thing — 141 lines — stays where its author put it; the contents beside it link to each section on GitHub.
Host compatibility
This copy is adapted from Clio Coder. Apply the procedure using the current host's available tools and the user's authorized scope. The tool names, /skill invocations, .clio-coder paths, fleets, approval gates and completion gates below describe Clio Coder; they are not installed or enforced by this skill in another host. Use the host's actual skill invocation and equivalent tools. If no equivalent exists, report the missing capability. Do not assume a tool is unavailable merely because the original headless workflow says so. A referenced agent or skill must be installed before relying on it. Scientific MCPs must be configured separately.
Adapted skills use the clio-kit- prefix to distinguish them from upstream audited skills. For a companion skill named below, select its clio-kit- copy from this collection; native agents, fleets and external programs retain their original names.
Resolve Merge Conflicts
Resolve conflicts stopped during a merge, rebase, or cherry-pick from intent, not from picking whichever side makes markers disappear. The job ends with the operation completed and the project's validation checks green.
See conflict matrix for operation detection, the rebase ours/theirs reversal, and resolution patterns across conflict types (content, modify/delete, rename, binary, submodule, and lockfiles).
Arguments
Arguments are passed in the user invocation message. Interpret them structurally from the prompt:
/skill:clio-kit-resolve-merge-conflicts [--checks auto|command] [--continue|--no-continue]
Examples
/skill:clio-kit-resolve-merge-conflicts/skill:clio-kit-resolve-merge-conflicts --checks "npm test"/skill:clio-kit-resolve-merge-conflicts --no-continue
Options
--checks <auto|command>: Validation checks execution mode.auto(default): Detects and runs test, typecheck, and lint commands from the repository (CI workflows, Makefile, package manifests).<command>: Custom shell command to run for verification (e.g.npm test,cargo check).
--continue|--no-continue: Whether to complete the in-flight operation after resolution and validation.--continue(default): Runs the operation's continue command (git merge --continue,git rebase --continue, orgit cherry-pick --continue).--no-continue: Leaves resolved files staged in the index and stops without executing the continue command.
What ships with it
4 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.
- 9d ago First seen · 141 lines · 76 tokens per session scan A feefdffe793d
clio-kit-resolve-merge-conflicts is a skill published in the GitHub repository iowarp/clio-kit (30 stars, last pushed 8d ago), licensed BSD-3-Clause. It adds 76 tokens to every session and 1,842 once invoked, about $0.0003 per session on Opus 5.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-10-08.
Other skills, from other repositories
pr-to-main
A pull-request workflow for submitting feature or bug-fix changes to the main branch in a pnpm and Changesets monorepo. A monorepo stores multiple related packages in one repository, while Changesets records release information.
pr-to-main-cleanup
A cleanup tool for deleting feature branches after their pull request has been merged into the main branch. A branch is a separate line of development in a code repository.
issue-management
Create, update, list and search GitHub issues and PRs, list a repository's labels, run milestones, and check for duplicates.
release-management
Tag a commit, publish a GitHub release, and read, correct or withdraw the tags and releases already there.
pr-analysis
Analyse a GitHub pull request by fetching its metadata, diff, linked issues and CI status.
pr-management
Manage the lifecycle of a GitHub PR - create, update the description, assign, refresh the branch and merge.