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 gongyijie85/mattpocock-skills-dsh-zh --skill resolving-merge-conflicts-zhgit clone --depth 1 https://github.com/gongyijie85/mattpocock-skills-dsh-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/gongyijie85/mattpocock-skills-dsh-zh/resolving-merge-conflicts-zh)<a href="https://agentmods.dev/skills/gongyijie85/mattpocock-skills-dsh-zh/resolving-merge-conflicts-zh"><img src="https://agentmods.dev/badge/skills/gongyijie85/mattpocock-skills-dsh-zh/resolving-merge-conflicts-zh/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/gongyijie85/mattpocock-skills-dsh-zh/resolving-merge-conflicts-zh"><img src="https://agentmods.dev/badge/skills/gongyijie85/mattpocock-skills-dsh-zh/resolving-merge-conflicts-zh.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.00026 | $0.00246 |
| Opus 5 | $0.00013 | $0.00123 |
| Sonnet 5 | $0.00005 | $0.00049 |
| Haiku 4.5 | $0.00003 | $0.00025 |
Grade A, and why
resolving-merge-conflicts-zh 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 yesterday.
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 历史与冲突文件。
-
为每个冲突找到 primary sources（一手来源）。深入理解每项变更为何产生、原始意图是什么。阅读 commit messages，查看 PRs，查看原始的 issues/tickets。
-
解决每个 hunk（代码块）。尽可能保留双方的意图。当意图互不兼容时，选择与 merge 的既定目标一致的那一个，并记下取舍。不要凭空发明新行为。始终去解决；绝不
--abort。 -
找出项目的自动化检查并运行它们——通常是 typecheck，然后是 tests，最后是 format。修复 merge 破坏的任何东西。
-
完成 merge/rebase。 暂存所有内容并提交。如果正在 rebase，继续 rebase 流程，直到所有 commits 都完成 rebase。
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.
- yesterday First seen · 15 lines · 26 tokens per session scan A 5f2ae3980d66
resolving-merge-conflicts-zh is a skill published in the GitHub repository gongyijie85/mattpocock-skills-dsh-zh (5 stars, last pushed yesterday), licensed MIT. It adds 26 tokens to every session and 246 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-09-11.
Other skills, from other repositories
commit-message
Guidance for writing Git commit messages using Conventional Commits, a common format such as fix, feat, or docs followed by a short description. It focuses on explaining why a change was made.
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.
market-pre-push-checks
Use before pushing, merging, or claiming a green tree in dsh-agent-plugins-market, to select the smallest checks that cover the outgoing diff instead of reflexively running the full suite.
market-release
A release workflow for publishing a new version of a software package. It uses release-please to create a release pull request, then creates a tag, a GitHub release, and an npm publication after the pull request is merged.
release-deploy
A release and deployment skill for preparing a software project for GitHub publication and putting it online.