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 deepklarity/harness-kit --skill hk-merge-resolvegit clone --depth 1 https://github.com/deepklarity/harness-kitWrote 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/deepklarity/harness-kit/hk-merge-resolve)<a href="https://agentmods.dev/skills/deepklarity/harness-kit/hk-merge-resolve"><img src="https://agentmods.dev/badge/skills/deepklarity/harness-kit/hk-merge-resolve/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/deepklarity/harness-kit/hk-merge-resolve"><img src="https://agentmods.dev/badge/skills/deepklarity/harness-kit/hk-merge-resolve.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.00045 | $0.02077 |
| Opus 5.5 | $0.00018 | $0.00831 |
| Sonnet 5.5 | $0.00009 | $0.00415 |
| Haiku 4.5 | $0.00005 | $0.00208 |
Grade A, and why
hk-merge-resolve 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.
How it starts
The opening of the file, as written. The whole thing — 186 lines — stays where its author put it; the contents beside it link to each section on GitHub.
Resolve Merge Conflicts
Your job is to resolve all merge conflicts in the current branch of the current repo.
Conflicts can come from many sources — git merge, git rebase, git stash pop, git cherry-pick, or any operation that combines divergent changes. This skill handles all of them.
Step 0: Diagnose the Situation
Before changing anything, understand what state git is in and what caused the conflicts.
-
Snapshot the state — Run these to understand what's happening:
git status git rev-parse HEADPrint the HEAD sha to the user: "Safety checkpoint: HEAD is at
<sha>." -
Identify the conflict source — Check which operation is in progress:
git rev-parse MERGE_HEAD 2>/dev/null→ merge in progresstest -d .git/rebase-merge || test -d .git/rebase-apply→ rebase in progressgit stash list+ checkgit statusfor "Unmerged paths" without MERGE_HEAD → stash pop conflict
This matters because the abort/recovery command differs:
Source Abort command merge git merge --abortrebase git rebase --abortcherry-pick git cherry-pick --abortstash pop git checkout -- .(stash stays in list, nothing lost)Print the appropriate abort command to the user so they have an escape hatch.
-
Protect unstashed work — If there are uncommitted changes beyond the conflicted files (tracked modified files that aren't part of the conflict), warn the user. These are at risk during resolution. Suggest committing or stashing them separately before proceeding, and wait for confirmation.
Do NOT blindly
git stashwhen conflicts are already present — git won't allow it, and if the conflicts came from astash pop, the user's changes are already in the working tree as the conflicted content. Stashing again would lose them.
Step 1: Build Context
Understand what both sides of the conflict were trying to do:
- Identify the two sides — Based on the conflict source:
- Merge: "ours" = current branch, "theirs" = the branch being merged in
- Stash pop: "ours" = current working tree (post-pull), "theirs" = the stashed changes (the user's local work)
- Rebase: "ours" = the branch being rebased onto, "theirs" = the commits being replayed
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 · 186 lines · 45 tokens per session scan A edcaa0cce256
hk-merge-resolve is a skill published in the GitHub repository deepklarity/harness-kit (102 stars, last pushed 3mo ago), licensed MIT. It adds 45 tokens to every session and 2,077 once invoked, about $0.0002 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-30.
Other skills, from other repositories
agent-sync-coordinator
Agent skill for sync-coordinator - invoke with $agent-sync-coordinator.
agentic-jujutsu
Quantum-resistant, self-learning version control for AI agents with ReasoningBank intelligence and multi-agent coordination.
agent-release-manager
Agent skill for release-manager - invoke with $agent-release-manager.
agent-release-swarm
Agent skill for release-swarm - invoke with $agent-release-swarm.
agent-repo-architect
Agent skill for repo-architect - invoke with $agent-repo-architect.
agent-swarm-pr
Agent skill for swarm-pr - invoke with $agent-swarm-pr.