fix-merge-conflicts
Resolve merge conflicts non-interactively, validate build and tests, and finalize conflict resolution
Install
With your agent
Install OMGSkills skill "cursor/plugins:fix-merge-conflicts" into this agent's normal skills directory: call the OMGSkills MCP get_install_plan tool for your agent and run the script it returns (it installs only the pinned commit and verifies SKILL.md), and stop if MCP or the pin is unavailable. Do not overwrite or change existing skills without asking me.
Manual command
git clone https://github.com/cursor/plugins /tmp/plugins && ln -s /tmp/plugins/cursor-team-kit/skills/fix-merge-conflicts ~/.claude/skills/fix-merge-conflictsFrom README
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
More from this repo
architect
Sketch types, signatures, and module structure before code, then stay in the loop while implementation fills in.
arena
Spawn N parallel candidates at the same task, pick a base, graft the strongest parts of the losers into it.
interrogate
Use for "interrogate", "adversarial review", "multi-model review", "challenge this", "stress test this code", "find...