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 agentmods add skills/ssbun/csl-agent-kit/git-conflictnpx skills add SSBun/csl-agent-kit --skill git-conflictgit clone --depth 1 https://github.com/SSBun/csl-agent-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/ssbun/csl-agent-kit/git-conflict)<a href="https://agentmods.dev/skills/ssbun/csl-agent-kit/git-conflict"><img src="https://agentmods.dev/badge/skills/ssbun/csl-agent-kit/git-conflict.svg" alt="Measured on agentmods" 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 | $0.00029 | $0.00380 |
| Opus 5 | $0.00015 | $0.00190 |
| Sonnet 5 | $0.00006 | $0.00076 |
| Haiku 4.5 | $0.00003 | $0.00038 |
Grade A, and why
git-conflict 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 3d 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
Git Conflict
Resolve the active operation narrowly; do not turn conflict resolution into a refactor.
-
Map the operation.
- Run
git statusand inspect relevant history to identify the active merge or rebase, its goal, the current commit, and every unmerged path. - Read each file's base and both conflict stages. During a rebase, do not infer branch intent from the
oursandtheirslabels alone. - Continue only when every conflict and both intended changes are understood.
- Run
-
Resolve intent.
- Use repository code and commit messages first; consult linked PRs or issues when available.
- Preserve both compatible intents. If they are incompatible, follow the operation's established goal; ask the user when the correct product choice remains unclear.
- Do not invent behavior or refactor adjacent code.
-
Verify the tree.
- Remove every conflict marker, then stage only the resolved paths. Leave unrelated working-tree changes untouched.
- Confirm Git reports no unmerged paths and
git diff --cached --checkpasses. - Run the repository's required checks in its prescribed order. Fix only regressions caused by the resolution.
-
Continue Git.
- For a merge, run
git merge --continue, or commit when Git instructs. - For a rebase, run
git rebase --continueand repeat this workflow for each later conflict. - Finish only when Git reports no merge or rebase in progress and the final history and status match the intended result.
- For a merge, run
Never abort the operation, discard a side wholesale, or stage unrelated changes unless the user explicitly asks.
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.
- 3d ago First seen · 31 lines · 29 tokens per session scan A 56b68205286c
git-conflict is a skill published in the GitHub repository SSBun/csl-agent-kit (10 stars, last pushed 5d ago), licensed MIT. It adds 29 tokens to every session and 380 once invoked, about $0.0001 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
systematic-debugging
Use when encountering any bug, test failure, or unexpected behavior, before proposing fixes.
brainstorming
You MUST use this before any creative work - creating features, building components, adding functionality, or modifying behavior. Explores user intent, requirements and design before implementation.
auto-perf-optimize
Run agent-driven VS Code performance or memory investigations. Use when asked to launch Code OSS, automate a VS Code scenario, run the Chat memory smoke runner, capture renderer heap snapshots, take workflow screenshots, compare run summaries, or drive a repeatable scenario before heap-snapshot analysis.
chat-perf
Run chat perf benchmarks and memory leak checks against the local dev build or any published VS Code version. Use when investigating chat rendering regressions, validating perf-sensitive changes to chat UI, or checking for memory leaks in the chat response pipeline.
chat-pet-sprite-creation
Use when creating or changing VS Code chat pet sprite art, sprite sheets, state animations, eye treatments, Stable/Insiders variants, or pet transitions under src/vs/workbench/contrib/chat/browser/widget/media/chatPet.
cpu-profile-analysis
Analyze V8/Chrome CPU profiles (.cpuprofile) and DevTools trace files (Trace-.json). Use when: profiling performance, investigating slow functions, comparing code paths, finding bottlenecks, analyzing timeToRequest, understanding call trees from sampling profiler data, analyzing layout/paint/rendering, investigating…