fix-merge-conflicts
cursor/plugins
Resolve merge conflicts non-interactively with validation and testing.
What is fix-merge-conflicts?
Automatically detects and resolves merge conflicts in your codebase, validates the build and tests, then stages the resolved files. Use this when you have unresolved conflicts and need a reliable path back to a buildable state.
- Detects all conflicting files from git status and conflict markers
- Resolves conflicts with minimal, correctness-first edits
- Preserves both sides when safe; otherwise chooses the variant that compiles and maintains stable behavior
- Regenerates lockfiles using package manager tools instead of hand-editing
- Runs compile, lint, and relevant tests to validate the resolution
- Stages resolved files and summarizes key resolution decisions
How to install fix-merge-conflicts
npx skills add https://github.com/cursor/plugins --skill fix-merge-conflictsHow to use fix-merge-conflicts
- 1.Run the skill when your branch has unresolved merge conflicts
- 2.The skill detects conflicting files and resolves them with minimal edits
- 3.It regenerates lockfiles and runs compile, lint, and test commands
- 4.Review the summary of resolved files and resolution choices
- 5.Stage and commit the resolved changes
Use cases
- Automatically resolve conflicts after a failed merge to get back to a buildable state
- Validate that conflict resolution doesn't break the build or tests
- Handle lockfile conflicts by regenerating them rather than manual editing
- Document key resolution choices for team review
- Resolve conflicts in CI/CD pipelines without manual intervention
- Developers managing complex merges
- Teams using automated CI/CD workflows
- Anyone needing reliable, non-interactive conflict resolution
fix-merge-conflicts FAQ
The skill uses a correctness-first approach: it preserves both sides when safe, or chooses the variant that compiles and keeps public behavior stable. If neither option works, the conflict markers remain for manual review.
No. The skill stages resolved files and summarizes decisions, but does not push or tag during conflict resolution.
Lockfile conflicts are resolved by regenerating them with package manager tools (e.g., npm, yarn, cargo) rather than hand-editing.
The skill runs compile, lint, and relevant tests to ensure the resolved code builds and passes validation.
Full instructions (SKILL.md)
Source of truth, from cursor/plugins.
name: fix-merge-conflicts description: Resolve merge conflicts non-interactively, validate build and tests, and finalize conflict resolution
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
Related skills
More from cursor/plugins and the wider catalog.
get-pr-comments
Fetch and summarize review comments from your active pull request
how
Understand subsystem architecture and code flow before making changes.
interrogate
Spawn multiple LLM reviewers to adversarially challenge code changes from independent angles.
loop-on-ci
Monitor PR checks and fix failures until green using gh pr checks.
maintain-verification-skill
Audit and refresh a project's verification skill to keep its feature map aligned with current source and behavior.
make-pr-easy-to-review
Clean up PR history, improve descriptions, and guide reviewers without changing code behavior.