Fix Merge Conflicts
Resolve merge conflicts non-interactively, validate build and tests, and finalize conflict resolution
Specification
- Skill ID
- cursor/plugins/fix-merge-conflicts
- Publisher
- cursor
- Repository
- plugins
- Installs
- 0
- Files
- 1
- Synced
- Sep 23, 2026
How to use it
Open any RiverX project, open the Skills panel in the chat, and search for this identifier. The files are fetched from the source repository at install time.
cursor/plugins/fix-merge-conflictsInstalls these files- SKILL.md
What this skill tells the agent
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 cursor
Use this skill in a project
Open any RiverX project, search the Skills panel for cursor/plugins/fix-merge-conflicts, and install it in one click.