mk-resolving-merge-conflicts
95 / 100 · Low risk
Fine to try. Some of what it can do is expected: a coding skill usually runs build and test commands.
Resolves an in-progress git merge/rebase conflict: reads conflict state, recovers each side's intent, resolves hunks, runs checks. NOT for the ship pipeline (mk:ship); NOT for bug debugging (mk:fix).
What this skill can do
Runs commands on your computer
Install
Paste this into your terminal. It downloads exactly the version we scanned, not whatever is newest.
if [ -e ~/.agents/skills/'mk-resolving-merge-conflicts' ] || [ -L ~/.agents/skills/'mk-resolving-merge-conflicts' ]; then echo 'A skill folder named mk-resolving-merge-conflicts already exists — not replacing it' >&2; false; else d=$(mktemp -d) && git clone --quiet --filter=blob:none --no-checkout 'https://github.com/ngocsangyem/MeowKit' "$d" && git -C "$d" checkout --quiet 'fbe7678743da08fc3293c1e1060d73bdb493f4e1' -- 'packages/mewkit/src/migrate/modules/codex/root/.agents/skills/mk-resolving-merge-conflicts' && mkdir -p ~/.agents/skills && cp -R "$d"/'packages/mewkit/src/migrate/modules/codex/root/.agents/skills/mk-resolving-merge-conflicts' ~/.agents/skills/'mk-resolving-merge-conflicts' && rm -rf "$d"; fi
Codex reads ~/.agents/skills directly. For Claude Code, Cursor, Copilot, Gemini CLI, Antigravity or OpenCode, also link it. For Claude Code: ln -s ~/.agents/skills/'mk-resolving-merge-conflicts' ~/.claude/skills/'mk-resolving-merge-conflicts' (other agents: ~/.cursor/skills, ~/.copilot/skills, ~/.gemini/skills, ~/.gemini/config/skills, ~/.config/opencode/skills). Or install through the finder skill, which does both.
Badge for your README
[](https://zalavijaysinh.github.io/skilltrust/repos/ngocsangyem/MeowKit/)
Score history
| Date | Version | Score |
|---|---|---|
| 2026-11-12 | fbe7678 | 95 |
| 2026-11-08 | 0b55691 | 100 |
Also found in
- ngocsangyem/MeowKit/packages/mewkit/src/migrate/modules/cursor/root/.cursor/skills/mk-resolving-merge-conflicts