How do I install the Resolve Conflicts Claude Code skill?

Install via the ClaudSkills desktop app (one click) or copy SKILL.md from the source repository to ~/.claude/skills/resolve-conflicts/SKILL.md and restart Claude Code. Both flows are detailed at https://claudskills.com/install/.

Is this skill free to install?

Yes. ClaudSkills is an open registry — every skill keeps its source repository's license, and manual install via copy is free. ClaudSkills Pro ($9/mo, $79/yr, or $149 one-time) adds one-click install via the desktop app and a multi-signal Quality Score.

ClaudSkills / General / orchestration-frameworks

Resolve Conflicts

Category: General · Sub-category: orchestration-frameworks · Last updated: 2026-05-08

Use this skill immediately when the user mentions merge conflicts that need to be resolved. Do not attempt to resolve conflicts directly - invoke this skill first. This skill specializes in providing a structured framework for merging imports, tests, lock files (regeneration), configuration files, and handling deleted-but-modified files with backup and analysis.

What this skill does

Resolve Conflicts is a community-contributed Claude Code skill in the orchestration-frameworks sub-category. It ships as a SKILL.md file that Claude Code auto-discovers under ~/.claude/skills/resolve-conflicts/ and loads when your prompt matches the skill's trigger.

Who uses this skill

The Resolve Conflicts skill is built for Claude Code users and developers across all disciplines looking for general-purpose AI assistance. It is part of the open ClaudSkills registry, a community-curated catalog of 56,000+ capabilities you can install for Claude Code — the Claude CLI agent.

How to install

Free

Manual install (2 steps)

mkdir -p ~/.claude/skills/resolve-conflicts
curl -L https://claudskills.com/skills/resolve-conflicts/SKILL.md \
  -o ~/.claude/skills/resolve-conflicts/SKILL.md

Or just download SKILL.md directly and drop it into ~/.claude/skills/resolve-conflicts/. Claude Code auto-discovers it on next session.

Skills live at ~/.claude/skills/resolve-conflicts/SKILL.md on macOS/Linux, or %USERPROFILE%\.claude\skills\resolve-conflicts\SKILL.md on Windows. See the full install guide for step-by-step instructions.

Pro

One-click install via the desktop app

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.

Pro

For the full experience including quality scoring and one-click install features for each skill — upgrade to Pro.

See pricing → Download desktop app

More General skills

Browse all General skills in the ClaudSkills registry, or explore these other picks from the same category:

Browse all General skills → Top 100 skills

Part of ClaudSkills — the open registry for Claude Code skills. · What's New · Install guide · About · llms.txt

Part of Acreator Store — Adam Lankamer's AI tools: GifPerfect · AspectPerfect · SlomoPerfect · Ucaption · UTagger · AutoXPoster · TestYourSkills