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 devcxl/mattpocock-skills-zh --skill resolving-merge-conflictsgit clone --depth 1 https://github.com/devcxl/mattpocock-skills-zhWrote 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/devcxl/mattpocock-skills-zh/resolving-merge-conflicts)<a href="https://agentmods.dev/skills/devcxl/mattpocock-skills-zh/resolving-merge-conflicts"><img src="https://agentmods.dev/badge/skills/devcxl/mattpocock-skills-zh/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/devcxl/mattpocock-skills-zh/resolving-merge-conflicts"><img src="https://agentmods.dev/badge/skills/devcxl/mattpocock-skills-zh/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.00025 | $0.00236 |
| Opus 5 | $0.00013 | $0.00118 |
| Sonnet 5 | $0.00005 | $0.00047 |
| Haiku 4.5 | $0.00003 | $0.00024 |
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 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.
What it actually says
-
查看当前状态——merge/rebase 处于什么状态。检查 git 历史与冲突文件。
-
找到每一处冲突的主要来源。深入理解每次变更背后的原因和原始意图。阅读 commit 信息、查看 PR、查看原始 issue/ticket。
-
逐个解决冲突块（hunk）。尽可能同时保留双方的意图。若不兼容，选择与 merge 公开目标一致的一方，并记录权衡。不要发明新行为。始终要解决，永远不要
--abort。 -
找出项目的自动化检查并运行——通常是 typecheck，然后是 tests，最后是 format。修复 merge 破坏的任何东西。
-
完成 merge/rebase。把所有改动 stage 并 commit。若是 rebase，就继续推进，直到所有 commit 都 rebase 完。
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.
- 11d ago First seen · 15 lines · 25 tokens per session scan A d2b61a713799
resolving-merge-conflicts is a skill published in the GitHub repository devcxl/mattpocock-skills-zh (340 stars, last pushed 6d ago), licensed MIT. It adds 25 tokens to every session and 236 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-30.
Other skills, from other repositories
chinese-git-workflow
A reference for configuring Git with Chinese code-hosting services such as Gitee, Coding.net, GitLab China, and CNB, including SSH, HTTPS, credentials, CI, and repository mirroring.
chinese-commit-conventions
A Chinese-language guide to Conventional Commits, a format for writing consistent Git commit messages, plus related changelog, commit-checking, and commit-helper configuration.
using-git-worktrees
A guide to using Git worktrees, which let you keep multiple branches in separate folders at the same time.
finishing-a-development-branch
A process for finishing a completed development branch. A branch is a separate line of code changes that can later be merged or submitted as a pull request.
dsh-git-commit
A Git commit guide for writing standardised commit messages and performing basic checks before committing code. Git commits are saved checkpoints in a project’s history.
dsh-changelog
A release-note writing guide for maintaining a CHANGELOG, a file that records what changed in each software version. It follows Keep a Changelog categories and semantic versioning rules.