Borrowing it
Nothing to install: this file belongs to stevesolun/ctx. Take a copy, put it at the same path in your own repository, and replace the rules that are about this project with yours.
curl -O https://raw.githubusercontent.com/stevesolun/ctx/main/.agents/skills/resolving-merge-conflicts/SKILL.mdgit clone --depth 1 https://github.com/stevesolun/ctxWrote 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/stevesolun/ctx/resolving-merge-conflicts)<a href="https://agentmods.dev/skills/stevesolun/ctx/resolving-merge-conflicts"><img src="https://agentmods.dev/badge/skills/stevesolun/ctx/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/stevesolun/ctx/resolving-merge-conflicts"><img src="https://agentmods.dev/badge/skills/stevesolun/ctx/resolving-merge-conflicts.svg" alt="Reviewed on agentmods" width="80" height="20"></a>- NVIDIA SkillSpector pass
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.00042 | $0.00269 |
| Opus 5.5 | $0.00017 | $0.00108 |
| Sonnet 5.5 | $0.00008 | $0.00054 |
| Haiku 4.5 | $0.00004 | $0.00027 |
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 1mo 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
Resolve Merge Conflicts
- Inspect the current Git state, the operation in progress, its goal, and every conflicting file.
- Reconstruct each side's intent from the code, nearby tests, history, commit messages, and linked work items that are available and useful.
- Resolve each hunk by preserving compatible intent. Where intents conflict, prefer the merge's stated goal and current repository contracts; avoid inventing unrelated behavior.
- Run focused checks for the affected surface, then broader checks when risk or repository guidance warrants them.
- Unless the user requested advice or review only, stage resolved files and continue the current merge or rebase when it is safe to do so. Report what was resolved, what was verified, and any remaining uncertainty.
Pause rather than guess when neither intent can be preserved safely. Aborting or restarting can be the correct recovery when the base is wrong, the operation is contaminated, or the user prefers a clean retry; explain the trade-off before taking that destructive step.
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.
- 1mo ago First seen · 25 lines · 42 tokens per session scan A a43e9830bb01
resolving-merge-conflicts is a skill published in the GitHub repository stevesolun/ctx (589 stars, last pushed 11d ago), licensed MIT. It adds 42 tokens to every session and 269 once invoked, about $0.0002 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-08-30.
Other skills, from other repositories
fork-fleet
Fork divergence monitor - tracks where the fleet's active forks diverge in CODE (unique commits, new/modified skills) and CONFIG (enable/var/model/schedule vs upstream), gated on real change.
pr-review
Review open PRs two ways - default is a per-PR deep review with severity-tagged findings, inline comments, and a verdict; --survey runs a risk-tiered triage digest of what's safe to merge first.
aeon-update
Pull framework updates from the upstream Aeon repo into this instance - 3-way merges canon's new commits into a PR, never clobbering operator config.
github-monitor
Watch your GitHub repos across four views - a combined urgency monitor (stale PRs, new issues, releases), a new-issue triage queue, a release upgrade digest, or your own opened-PR tracker.
pack-submit
Package one of this agent's own skills as a standalone community pack and submit it to the aeon registry as a PR.
shiplog
Recap of everything shipped since the last run - cross-repo PRs, security fixes, star deltas, and X traction, synthesized into a digest article and a ready-to-post shiplog in your voice.