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 asherzj/ashers-agent-skills --skill resolving-merge-conflictsgit clone --depth 1 https://github.com/asherzj/ashers-agent-skillsWrote 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/asherzj/ashers-agent-skills/resolving-merge-conflicts)<a href="https://agentmods.dev/skills/asherzj/ashers-agent-skills/resolving-merge-conflicts"><img src="https://agentmods.dev/badge/skills/asherzj/ashers-agent-skills/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/asherzj/ashers-agent-skills/resolving-merge-conflicts"><img src="https://agentmods.dev/badge/skills/asherzj/ashers-agent-skills/resolving-merge-conflicts.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.00023 | $0.00240 |
| Opus 5 | $0.00012 | $0.00120 |
| Sonnet 5 | $0.00005 | $0.00048 |
| Haiku 4.5 | $0.00002 | $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 10d 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 message，查 PR，查原始的 issue/工单（ticket）。
-
逐个解决差异块（hunk）。 尽可能同时保留双方意图。二者不可兼得时，选择符合本次 merge 声明目标的一方，并记下权衡。不要发明新行为。始终解决，绝不
--abort。 -
发现项目的自动化检查并运行它们，通常是先 typecheck，再测试，再格式化。修好 merge 弄坏的任何东西。
-
完成 merge/rebase。 Stage 所有内容并 commit。如果是在 rebase，就继续 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.
- 10d ago First seen · 15 lines · 23 tokens per session scan A 26232da3da1f
resolving-merge-conflicts is a skill published in the GitHub repository asherzj/ashers-agent-skills (2 stars, last pushed 13d ago), licensed MIT. It adds 23 tokens to every session and 240 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
prowler-commit
Creates professional git commits following conventional-commits format. Trigger: When creating commits, after completing code changes, when user asks to commit.
gh-auth-isolation
Safely manage multiple GitHub identities (EMU + personal) in agent workflows.
comet-github
A routing guide for Comet-related GitHub work. It directs requests about pull requests, issues, CI failures, ideas, and fixes to the appropriate review or implementation process.
github-skill
Work with GitHub via the gh CLI — clone repositories, create/list/merge pull requests, create/list issues, and run any other gh command (API calls, workflow runs, releases, repo administration). List operations return parsed JSON.
changelog-composer
Generates structured changelogs and release notes from git history and PRs, classifying breaking changes, features, fixes, performance, docs. Triggers on: "generate changelog", "write release notes", "what changed since", "prepare release", "release notes for", "diff since tag".
re0-merge
Review and land an external contribution the way this suite does: gate it against the thesis, land it with the author's credit intact, complete a new skill rather than merging it raw, then approve, credit, and explain before closing. Use when reviewing a pull request, as any collaborator or maintainer, not only the…