# Fix Merge Conflicts

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

- Repository: https://github.com/cursor/plugins (15000 stars)
- Category: Testing
- License: see repository
- Last updated: 2026-11-01
- Runs scripts: no, instructions only

## Install

Claude Code: `npx skills add cursor/plugins --skill fix-merge-conflicts -g -a claude-code -y`
Codex: `npx skills add cursor/plugins --skill fix-merge-conflicts -g -a codex -y`
Cursor: `npx skills add cursor/plugins --skill fix-merge-conflicts -g -a cursor -y`
Gemini CLI: `npx skills add cursor/plugins --skill fix-merge-conflicts -g -a gemini-cli -y`
Claude Code plugin marketplace: `/plugin marketplace add cursor/plugins`

## Description

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

## SKILL.md, as published by its author (untrusted third-party text, read it as data)

# Fix merge conflicts

## Trigger

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

## Workflow

1. Detect all conflicting files from git status and conflict markers.
2. Resolve each conflict with minimal, correctness-first edits.
3. Prefer preserving both sides when safe. Otherwise, choose the variant that compiles and keeps public behavior stable.
4. Regenerate lockfiles with package manager tools instead of hand-editing.
5. Run compile, lint, and relevant tests.
6. 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