# fix-merge-conflicts

> Claude/Codex skill by [@cursor](https://omgskills.com/library/cursor/index.md) · 5k stars · Updated 2026-08-25

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

## Install

```sh
git clone https://github.com/cursor/plugins /tmp/plugins && ln -s /tmp/plugins/cursor-team-kit/skills/fix-merge-conflicts ~/.claude/skills/fix-merge-conflicts
```

## From 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

## Links

- HTML page: https://omgskills.com/skills/cursor/plugins/fix-merge-conflicts/
- GitHub: https://github.com/cursor/plugins
- Author: [@cursor](https://omgskills.com/library/cursor/index.md)

## More from this repo

- [advisor](https://omgskills.com/skills/cursor/plugins/advisor/skills/advisor/index.md) — Advisor mode.
   - [@cursor](https://omgskills.com/library/cursor/index.md) · 7k stars
- [architect](https://omgskills.com/skills/cursor/plugins/architect/index.md) — Sketch types, signatures, and module structure before code, then stay in the loop while implementation fills in.
   - [@cursor](https://omgskills.com/library/cursor/index.md) · 6.9k stars
- [arena](https://omgskills.com/skills/cursor/plugins/arena/index.md) — Spawn N parallel candidates at the same task, pick a base, graft the strongest parts of the losers into it.
   - [@cursor](https://omgskills.com/library/cursor/index.md) · 5k stars