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 ngocsangyem/MeowKit --skill resolving-merge-conflictsgit clone --depth 1 https://github.com/ngocsangyem/MeowKitWrote 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/ngocsangyem/meowkit/resolving-merge-conflicts)<a href="https://agentmods.dev/skills/ngocsangyem/meowkit/resolving-merge-conflicts"><img src="https://agentmods.dev/badge/skills/ngocsangyem/meowkit/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/ngocsangyem/meowkit/resolving-merge-conflicts"><img src="https://agentmods.dev/badge/skills/ngocsangyem/meowkit/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.00139 | $0.02048 |
| Opus 5 | $0.00069 | $0.01024 |
| Sonnet 5 | $0.00028 | $0.00410 |
| Haiku 4.5 | $0.00014 | $0.00205 |
Grade A, and why
mk: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 5d 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 — 194 lines — stays where its author put it; the contents beside it link to each section on GitHub.
Resolving Merge Conflicts
Path convention: Commands assume cwd is the repo root (
$CLAUDE_PROJECT_DIR).
Iron Laws
- Resolve every conflict; do not abandon by default.
git merge --abortorgit rebase --abortrequires explicit user direction. Completing the operation with a commit orgit rebase --continuealso requires explicit user go-ahead. - Do not invent new behaviour. Resolution combines existing intents; it is not a place to add features or refactor.
When to Use
git statusshowsUnmerged paths/ "you have unmerged files"- A
git merge,git rebase,git cherry-pick, orgit pullstopped on conflicts - User says "resolve the conflicts", "fix the rebase", "finish the merge"
Do NOT use when: no operation is in progress (nothing to resolve), or the request is
to start a merge/ship from scratch (use mk:ship).
Workflow Integration
Phase: on-demand. Most often fires inside Phase 5 (Ship) when mk:ship merges the
base branch and hits conflicts. Hands control back once the working tree is clean and
checks pass.
Process
Copy this checklist and track progress:
- [ ] 1. See the current state (operation type + conflicted files)
- [ ] 2. Find the primary sources (why each side changed)
- [ ] 3. Resolve each hunk (preserve both intents)
- [ ] 4. Run the project's automated checks
- [ ] 5. Present resolved state and obtain approval to finish the merge/rebase
1. See the current state
Determine whether a merge or a rebase is in progress — the finish step differs.
git status # human summary + hint line
git diff --name-only --diff-filter=U # exact conflicted (unmerged) files
ls .git/MERGE_HEAD 2>/dev/null && echo MERGE # present => merge in progress
ls -d .git/rebase-merge .git/rebase-apply 2>/dev/null && echo REBASE
git log --oneline -5 --all --decorate # orient on recent history
Read every conflicted file. Note each <<<<<<< / ======= / >>>>>>> hunk and which
labels mark each side (HEAD/ours vs the incoming branch/commit).
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.
- 5d ago First seen · 194 lines · 139 tokens per session scan A 0eaf8f33d918
mk:resolving-merge-conflicts is a skill published in the GitHub repository ngocsangyem/MeowKit (14 stars, last pushed 1mo ago), licensed MIT. It adds 139 tokens to every session and 2,048 once invoked, about $0.0007 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-03.
Other skills, from other repositories
magpie-setup-upstream-fix
Turn a framework bug or quirk the agent hit while running a Magpie skill or tool into a fix PR against apache/magpie — one PR per issue. First confirms the problem is a framework defect (not a local misconfiguration or a stale snapshot), then searches apache/magpie for an existing issue or PR that already covers it…
github-auth-recovery
Recover from broken GitHub auth flows when git/gh operations fail. Use when gh is not logged in, HTTPS push/pull asks for credentials or errors like could not read Username, a repo remote is HTTPS but SSH may already work, or when GitHub operations fail and the agent needs a deterministic path to diagnose auth method…
prek-pro
Review, configure, and troubleshoot prek hooks when users need prek.toml edits, shim installs, hook validation, or pre-commit migration help.
issue-solver
Autonomous engineering agent that reads GitHub issues, traces root causes, designs GRASP-compliant fixes, runs tests, opens PRs, and closes issues only after merge.
refactor-planner
Turn a messy code area into a scoped refactor plan with risk controls.
history
In D&D, History recalls significant past events, legendary figures, and ancient knowledge. The real-world version is temporal investigation: git blame across the entire project, reading changelogs to understand why a decision was made, reconstructing the sequence of events that led to a production incident, or…