mk:resolving-merge-conflicts includes 5 code blocks for direct copy-paste. The SKILL.md runs to about 1,046 words, in the catalog's typical mid-range.
mk:resolving-merge-conflicts sits in the Engineering category under the engineering-misc sub-topic in the ClaudSkills catalog. There are 10 related skills indexed alongside it; comparing a few before installing usually reveals which fits your workflow best.
These notes are auto-generated from features detected in the SKILL.md file and from this catalog's structure — they aren't part of the source repository.
Iron Laws
mk:resolving-merge-conflicts is a community-contributed Claude Code skill in the engineering-misc sub-category. It ships as a SKILL.md file that Claude Code auto-discovers under ~/.claude/skills/resolving-merge-conflicts/ and loads when your prompt matches the skill's trigger.
When to invoke it: Use when asked to "resolve merge conflicts", "fix this rebase", "finish the merge", or when `git status` shows conflicted (unmerged) paths. NOT for the full ship pipeline that merges the base branch first (see mk:ship); NOT for debugging a runtime bug or test failure unrelated to a conflict (see mk:investigate / mk:fix).
The mk:resolving-merge-conflicts Claude Code skill is built for software engineers, backend developers, full-stack teams, and technical leads building and maintaining production systems. It's part of ClaudSkills (also referred to as Claude Skills or Claude Code Skills) — the open community-curated registry of 158,000+ SKILL.md files for Anthropic's Claude Code agent and the wider Claude ecosystem (Claude API, Claude Agent SDK).
mkdir -p ~/.claude/skills/resolving-merge-conflicts curl -L https://claudskills.com/skills/resolving-merge-conflicts/SKILL.md \ -o ~/.claude/skills/resolving-merge-conflicts/SKILL.md
Or just download SKILL.md directly and drop it into ~/.claude/skills/resolving-merge-conflicts/. Claude Code auto-discovers it on next session.
Skills live at ~/.claude/skills/resolving-merge-conflicts/SKILL.md on macOS/Linux, or %USERPROFILE%\.claude\skills\resolving-merge-conflicts\SKILL.md on Windows. See the full install guide for step-by-step instructions.
Open @claudskills_bot on Telegram, tap Open Desktop App, and the desktop app installs this skill for you. Or share the bot link with a colleague — they get the same one-tap install. Learn more →
The ClaudSkills desktop app installs any skill directly into ~/.claude/skills/ with one click — no terminal required. Pro starts at $9/mo or $149 lifetime.
For the full experience including quality scoring and one-click install features for each skill — upgrade to Pro.
SKILL.md from the source repository to ~/.claude/skills/resolving-merge-conflicts/SKILL.md and restart Claude Code. Both flows are detailed at claudskills.com/install/.SKILL.md file that lives under ~/.claude/skills/<name>/ and tells the Claude Code CLI agent how to perform a specific task (instructions, prompts, allowed tools). Skills are auto-discovered at session start. mk:resolving-merge-conflicts is one of 67,000+ skills indexed in the open ClaudSkills catalog, classified under the Engineering category. Learn more at /learn/what-is-a-claude-skill/.If you reference this skill in a blog post, paper, or documentation, you can cite it as:
@misc{resolving-merge-conflicts-2026,
author = {ngocsangyem},
title = {mk:resolving-merge-conflicts [Claude Code skill]},
year = {2026},
publisher = {ClaudSkills},
url = {https://claudskills.com/skills/resolving-merge-conflicts/}
}Grade A · scanned 2026-07-23 — free static scan against the OWASP Agentic Skills Top 10.
No risk patterns were found in any of the ten OWASP-aligned categories. How grading works ›
Browse all Engineering skills in the ClaudSkills registry, or explore these other picks from the same category:
Part of Acreator Store — Adam Lankamer's AI tools: PerfectStudio · Ucaption · UTagger · AutoXPoster · TestYourSkills · AutomationFlows · Au Naturel · Telegram @acreatorstore
SKILL.md files, not affiliated with, endorsed by, or sponsored by Anthropic.