Fix Merge Conflicts

When you're staring down merge conflicts and just need to get back to a clean build, this skill handles the resolution non-interactively. It detects conflicting files, resolves them with minimal edits that prioritize correctness, and validates everything compiles and passes tests before staging. The approach is pragmatic: preserve both sides when safe, otherwise pick what keeps things stable. It'll regenerate lockfiles properly instead of making you hand-edit them, and it won't leave conflict markers behind or try to sneak in refactors. The real value is in the workflow discipline: it forces validation before you finalize, which is exactly what you want when you're rushing to unblock a branch.

skills.sh installs: 2.8K
GitHub stars: 15.9K
last updated: Aug 21, 2026

View on GitHub

Install

$ npx -y skills add cursor/plugins --skill fix-merge-conflicts --agent claude-code

Installs into .claude/skills of the current project.

Files

Fix merge conflicts

Trigger

Branch has unresolved merge conflicts and needs a reliable path to a buildable state.

Workflow

Detect all conflicting files from git status and conflict markers.
Resolve each conflict with minimal, correctness-first edits.
Prefer preserving both sides when safe. Otherwise, choose the variant that compiles and keeps public behavior stable.
Regenerate lockfiles with package manager tools instead of hand-editing.
Run compile, lint, and relevant tests.
Stage resolved files and summarize key decisions.