fix-merge-conflicts

by michael-denyer2.6k

Developer Tools

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

Install

The skill file stays in the publisher's repository.

Paste the copied command in a terminal. It installs this SKILL.md into that agent.

npx skills add michael-denyer/pstack-claude --skill fix-merge-conflicts -a cursor -y

How do I install fix-merge-conflicts?: Download plugins/pstack/skills/fix-merge-conflicts/SKILL.md from the publisher, or copy the path and open the repository. PlugMCP lists the skill and does not host the file.
Where does fix-merge-conflicts live?: The publisher keeps it at https://github.com/michael-denyer/pstack-claude.
Which agents can use fix-merge-conflicts?: Claude, Cursor, and Codex can read a SKILL.md you add from the publisher's repository.

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

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.