mcpbeat Sign in

Fix Merge Conflicts Skill for Claude

by michael-denyer

Resolve merge conflicts non-interactively, validate build and tests, and finalize conflict resolution

247 tokens
context cost
the whole folder, loaded on every use
1
files
instructions only
0
copies elsewhere
how many repositories repackaged it
255
stars on the repo
on the repository, not the skill itself

Install

one command, takes just this skill from the repository 
npx skills add https://github.com/michael-denyer/pstack-claude --skill fix-merge-conflicts

The instruction itself

5 sections, as written by the author

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.

Guardrails

  • Keep changes minimal and readable.
  • Do not leave conflict markers in any file.
  • Avoid broad refactors while resolving conflicts.
  • Do not push or tag during conflict resolution.

Output

  • Files resolved
  • Notable resolution choices
  • Build/test outcome

How to use it

Copy the folder

Take michael-denyer/fix-merge-conflicts from the repository into ~/.claude/skills for personal use, or into .claude/skills inside a project.

Check the name does not clash

The agent identifies a skill by the name field in its header. Two skills with the same name cannot sit side by side — one of them will be ignored.