Getting it into your agent
It runs from inside its repository, so the clone comes first — what it calls does not travel with the file alone.
git clone --depth 1 https://github.com/VoidTechnology/voidtech-claude-pluginsnpx agentmods add skills/voidtechnology/voidtech-claude-plugins/fix-conflictsWrote 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/voidtechnology/voidtech-claude-plugins/fix-conflicts)<a href="https://agentmods.dev/skills/voidtechnology/voidtech-claude-plugins/fix-conflicts"><img src="https://agentmods.dev/badge/skills/voidtechnology/voidtech-claude-plugins/fix-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/voidtechnology/voidtech-claude-plugins/fix-conflicts"><img src="https://agentmods.dev/badge/skills/voidtechnology/voidtech-claude-plugins/fix-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.00027 | $0.00353 |
| Opus 5.5 | $0.00011 | $0.00141 |
| Sonnet 5.5 | $0.00005 | $0.00071 |
| Haiku 4.5 | $0.00003 | $0.00035 |
Grade A, and why
fix-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
Vendored from mattpocock/skills · MIT © 2026 Matt Pocock · upstream 6eeb81b · 已汉化并完成 VoidTech 插件内自包含适配。LICENSE 见 ../_vendor-licenses/mattpocock-LICENSE
-
查看 merge 或 rebase 的当前状态。 检查 Git 历史和发生冲突的文件。
-
找到每个冲突的来源。 理解两侧改动的原因和原始意图。优先阅读提交信息；如果可以访问相关 PR、issue 或工单，再补充阅读。无法访问远端时继续处理，但要记录缺少了哪些背景信息。
-
逐个冲突块解决。 尽可能保留双方意图。两者不兼容时，选择与本次合并目标一致的一方，并记录取舍。不要引入双方都没有要求的新行为。除非发现继续操作会造成数据丢失，否则不要中止流程。
-
找出并运行项目的自动化检查，通常依次执行类型检查、测试和格式检查。修复合并导致的问题。
-
完成 merge 或 rebase。 只有用户明确授权提交时，才暂存改动并继续当前 Git 流程；否则停在冲突已解决且检查已通过的状态，并给出后续命令。
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 · 16 lines · 27 tokens per session scan A 189e8d79e200
fix-conflicts is a skill published in the GitHub repository VoidTechnology/voidtech-claude-plugins (2 stars, last pushed 5d ago), licensed Apache-2.0. It adds 27 tokens to every session and 353 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-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.
release-helper
Ensures configuration and code changes are released correctly. Use PROACTIVELY whenever you edit config.json, change any setting, or fix a configuration bug in this project, so the change reaches production.
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.
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…