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 znlgis/my-opencode-deepseek-config --skill resolving-merge-conflictsgit clone --depth 1 https://github.com/znlgis/my-opencode-deepseek-configWrote 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/znlgis/my-opencode-deepseek-config/resolving-merge-conflicts)<a href="https://agentmods.dev/skills/znlgis/my-opencode-deepseek-config/resolving-merge-conflicts"><img src="https://agentmods.dev/badge/skills/znlgis/my-opencode-deepseek-config/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/znlgis/my-opencode-deepseek-config/resolving-merge-conflicts"><img src="https://agentmods.dev/badge/skills/znlgis/my-opencode-deepseek-config/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.00054 | $0.00439 |
| Opus 5 | $0.00027 | $0.00219 |
| Sonnet 5 | $0.00011 | $0.00088 |
| Haiku 4.5 | $0.00005 | $0.00044 |
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 6d 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
Resolving Merge Conflicts
When facing an in-progress git merge or rebase with conflicts:
-
See the current state. Check
git status,git log --oneline --merge, and the conflicting files withgit diff --diff-filter=U. -
Find the primary sources for each conflict. Understand why each change was made and its original intent. Read commit messages, check related PRs (use
gh-cliskill), and trace back to issues/tickets. -
Resolve each hunk. Preserve both intents where possible. Where incompatible, pick the one matching the merge's stated goal and note the trade-off. Never invent new behavior — you are resolving, not refactoring. Always resolve; never
git merge --abortorgit rebase --abort. -
Run automated checks. Discover the project's verification commands from
package.jsonscripts,Makefile, orAGENTS.md. Run typecheck, tests, then format. Fix anything the merge broke. -
Finish. Stage the resolved files by explicit path (
git add <path1> <path2>, orgit add -ufor tracked files only — nevergit add .orgit add <dir>, per AGENTS.md Git Safety), commit (git commitwithout-m— review the auto-generated merge message), or if rebasing,git rebase --continueuntil all commits are rebased.
Rules
- Conflict resolution is archaeology: understand the intent behind each side before touching code.
- Do not use
--abortto escape — it discards both sides' work. - If the same conflict pattern appears across multiple files, resolve them consistently.
- After resolution, the build must pass. If tests fail, the resolution broke something.
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.
- 6d ago Changed 048803cfdc9d
- 10d ago First seen · 26 lines · 54 tokens per session scan A 35c2d2b8d1ea
resolving-merge-conflicts is a skill published in the GitHub repository znlgis/my-opencode-deepseek-config (57 stars, last pushed yesterday), licensed MIT. It adds 54 tokens to every session and 439 once invoked, about $0.0003 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
project-session-manager
Worktree-first dev environment manager for issues, PRs, and features with optional tmux sessions.
worktrees
Manage Git worktrees as OMO safe isolated coding lanes for complex, risky, or parallel work.
release
Use this skill for EVERY ClawRouter release. Enforces the full checklist — version sync, CHANGELOG, build, tests, npm publish, git tag, GitHub release. No step can be skipped.
prepare-release
Prepare a new release by collecting commits, generating bilingual release notes, updating version files, and creating a release branch. Use when asked to prepare/create a release, bump version, or run /prepare-release.
gh-create-issue
Use when user wants to create a GitHub issue for the current repository. Must read and follow the repository's issue template format.
issue-reporter
A tool for submitting a GitHub Issue, Bug Report, or Feature Request when the user explicitly asks for one. A GitHub Issue is a tracked report or request in a software project.