fix-merge-conflicts
Resolve merge conflicts non-interactively, validate build and tests
by cursorFree
Description
fix-merge-conflicts is an agent skill from Cursor's plugins collection for resolving merge conflicts without interactive prompts and bringing a branch back to a buildable state. It is triggered when a branch has unresolved conflicts and needs a reliable route to something that compiles. The workflow detects every conflicting file from the git status output and the conflict markers, then resolves each conflict with minimal, correctness-first edits. Where it is safe, the skill prefers keeping both sides of a conflict. Otherwise it chooses the variant that compiles and keeps public behaviour stable. Lockfiles are regenerated with the package manager rather than edited by hand, which avoids inconsistent dependency trees. The agent then runs the compiler, the linter and the relevant tests, stages the resolved files, and summarises the key decisions so a reviewer can follow them. The guardrails keep the edits focused on the conflicts themselves. The skill suits developers who regularly rebase or merge long-running branches and want the mechanical part of conflict resolution handled while they check the decisions. It is listed on skills.sh, where the page shows install counts and GitHub stars for the Cursor plugins repository, and its security audits all pass, including Gen Agent Trust Hub, Socket and Snyk. Install it with npx skills add https://github.com/cursor/plugins --skill fix-merge-conflicts.…
Highlights
- Detects conflicting files
- Keeps both sides when safe
- Regenerates lockfiles with the package manager
- Runs compile, lint and tests
- Summarises decisions
- Installs from skills.sh
Ratings & Reviews
No ratings yet
Be the first to rate fix-merge-conflicts.
People also visit
make-pr-easy-to-review
Prepare PRs for review by cleaning noisy history, improving PR descriptions
fix-merge-conflicts FAQ
What does this skill do?
It resolves merge conflicts with minimal edits, validates the build and tests, stages the files and summarises the decisions.
How are lockfiles handled?
They are regenerated with the package manager instead of being edited by hand.
When does it keep both sides?
When that is safe. Otherwise it picks the variant that compiles and keeps public behaviour stable.
How do I install it?
Run npx skills add https://github.com/cursor/plugins --skill fix-merge-conflicts.
What are the security audit results?
skills.sh lists three audits: Gen Agent Trust Hub Pass, Socket Pass and Snyk Pass.
How popular is it?
The page shows about 2.6K installs, and the cursor/plugins repository has 11.4K GitHub stars.
What are the best fix-merge-conflicts alternatives?
Popular alternatives to fix-merge-conflicts include git-advanced-workflows, make-pr-easy-to-review and resolving-merge-conflicts. See all fix-merge-conflicts alternatives