Fix Merge Conflicts
- 1.6k installs
- 2.5k repo stars
- Updated August 5, 2026
- cursor/plugins
Fix Merge Conflicts is a Cursor plugin skill that detects, explains, and resolves Git merge conflicts non-interactively, then validates compile, lint, and tests for developers who need a buildable branch without leaving
About
Fix Merge Conflicts is a skill from cursor/plugins that runs when a branch has unresolved merge conflicts and needs a reliable path to a buildable state. The workflow detects conflicting files from git status and conflict markers, resolves each with minimal correctness-first edits, prefers preserving both sides when safe, and regenerates lockfiles with package managers instead of hand-editing. It then runs compile, lint, and relevant tests before staging resolved files and summarizing decisions. Developers reach for Fix Merge Conflicts after merges or rebases leave conflict markers blocking CI. The skill finalizes resolution non-interactively inside the editor session.
- Automatically surfaces merge conflicts in Cursor
- Provides natural-language explanations of conflicting changes
- Suggests intelligent resolution strategies based on context
- One-click accept of AI-generated merge fixes
- Works directly inside Cursor's composer and inline edits
Fix Merge Conflicts by the numbers
- 1,562 all-time installs (skills.sh)
- +210 installs in the week ending Aug 5, 2026 (Skillselion tracking)
- Ranked #44 of 733 Git & Pull Requests skills by installs in the Skillselion catalog
- Data as of Aug 5, 2026 (Skillselion catalog sync)
npx skills add https://github.com/cursor/plugins --skill fix-merge-conflictsAdd your badge
Show developers this skill is listed on Skillselion. Paste this into your README.
| Installs | 1.6k |
|---|---|
| repo stars | ★ 2.5k |
| Last updated | August 5, 2026 |
| Repository | cursor/plugins ↗ |
How do you resolve Git merge conflicts automatically?
Automatically detect, explain, and resolve Git merge conflicts without leaving the editor.
Who is it for?
Developers with active merge conflict markers who need non-interactive resolution plus build and test validation before committing.
Skip if: Repositories with no merge conflicts or teams that require manual human review of every conflict hunk without automated resolution.
When should I use this skill?
git status shows unresolved merge conflicts and the branch must return to a compile-ready state.
What you get
Resolved source files, regenerated lockfiles, passing compile/lint/tests, and staged git index ready for commit.
- resolved source files
- staged git index
By the numbers
- Workflow defines 6 numbered resolution and validation steps
- Runs compile, lint, and relevant tests before staging resolved files
Files
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
Related skills
Caveman CommitGenerate terse, Conventional Commits messages that preserve intent without fluff or AI attribution.272k94k
Resolving Merge ConflictsQuickly understand, resolve, and commit merge conflicts without losing work or breaking their flow.183k193kGit Guardrails Claude CodePrevent Claude Code from accidentally running destructive git commands like force push, hard reset, or clean.175k193k
Using Git WorktreesGuarantee every new feature or implementation task runs inside a clean, isolated workspace without polluting the main branch or current working directory.149k263k
Git CommitGenerate accurate conventional commit messages and intelligently stage files directly from natural language requests.40.6k37.2k
Resolve Merge ConflictsQuickly understand and resolve Git merge conflicts without losing context or breaking changes.16.5k148How it compares
Choose Fix Merge Conflicts for editor-native non-interactive resolution with test validation; use manual merge tools when policy requires human review of every hunk.
FAQ
What steps does Fix Merge Conflicts follow?
Fix Merge Conflicts detects conflicting files, resolves markers with minimal edits, regenerates lockfiles with package managers, runs compile/lint/tests, then stages resolved files and summarizes key decisions.
Does Fix Merge Conflicts edit lockfiles by hand?
Fix Merge Conflicts regenerates lockfiles using package manager tools instead of hand-editing, reducing corruption risk after dependency merge conflicts.