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 PyModel/pythinker-cli --skill resolve-merge-conflictsgit clone --depth 1 https://github.com/PyModel/pythinker-cliWrote 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/pymodel/pythinker-cli/resolve-merge-conflicts)<a href="https://agentmods.dev/skills/pymodel/pythinker-cli/resolve-merge-conflicts"><img src="https://agentmods.dev/badge/skills/pymodel/pythinker-cli/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/pymodel/pythinker-cli/resolve-merge-conflicts"><img src="https://agentmods.dev/badge/skills/pymodel/pythinker-cli/resolve-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.00024 | $0.00209 |
| Opus 5.5 | $0.00010 | $0.00084 |
| Sonnet 5.5 | $0.00005 | $0.00042 |
| Haiku 4.5 | $0.00002 | $0.00021 |
Grade A, and why
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 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
Use when files contain conflict markers or the user asks to resolve merge, rebase, or cherry-pick conflicts.
Workflow
- Inspect
git statusand list conflicted files. - Read each conflict with surrounding context.
- Understand the intent of both sides before editing.
- Resolve the conflict with the smallest combined change that preserves behavior.
- Run formatters/tests relevant to the resolved files when practical.
- Report any conflicts that need human product judgment.
Rules
- Never choose one side blindly.
- Do not run destructive git commands unless explicitly confirmed.
- Do not stage, commit, continue rebase, or continue merge unless the user asks.
- Remove all conflict markers from resolved files.
Output
SUMMARY
RESOLVED FILES
DECISIONS
VERIFICATION
BLOCKERS
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 · 35 lines · 24 tokens per session scan A 33f17ae115f9
resolve-merge-conflicts is a skill published in the GitHub repository PyModel/pythinker-cli (21 stars, last pushed 3d ago), licensed Apache-2.0. It adds 24 tokens to every session and 209 once invoked, about $0.0001 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
vhs-e2e-gif
Record a test run, a TUI session, or any terminal command as a GIF with VHS and attach it to a GitHub PR as a release-hosted asset, never a repo commit. Use when asked to record an e2e run, demo a fix on a PR, attach a GIF or screen recording to a pull request, show a test passing visually, or produce a terminal…
gh-find-prs
Survey open Codewhale PRs and triage each for mergeability and disposition against the real landing branch.
hunk-release
Prepares, publishes, verifies, and curates Hunk releases. Use for release metadata, benchmarks, tags, publishing, release videos, backports, or recovery.
git
Git and code hosting platform management — GitHub, GitLab, Codeberg, Forgejo. Zero barrier — install x-cmd and manage repos from the terminal. Use for "git", "github", "gitlab", "repo", "pull request", "code hosting".
agents-md
Generate AGENTS.md files for Go, Rust, TypeScript, and Java projects. Use this skill whenever the user asks to create, scaffold, bootstrap, update, or review an AGENTS.md (or agent-instructions, CLAUDE.md, repo guide for agents) file in a codebase. Also trigger when the user says "add AGENTS.md", "make this repo…
crossreview
Run when the user invokes /crossreview (or /crossreview:setup to choose the reviewers) or asks for a cross-review, a quorum review or a second opinion from other agents or models: fan a code review (uncommitted work, a branch, a commit range, files, a plan or a document) out to several console code agents (Claude…