SkillsAdd

cursor/plugins

fix-merge-conflicts

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

All-time #6712 Trending #6991 First seen Feb 18, 2026
8-week activity · all time api

Installation

$ npx skills add https://github.com/cursor/plugins
View on skills.sh ↗ GitHub repository ↗
Feature your product here Skill page unit · reach builders installing agent skills View pricing →

Similar popular skills

Related neighbors and high-traction skills in the same topics — useful to compare before installing.

agent-browser Shared topics
vercel-labs/agent-browser

Browser automation CLI for AI agents. Use when the user needs to interact with websites, includ…

11.9K installs
azure-validate Shared topics
microsoft/azure-skills

Pre-deployment validation for Azure readiness. Run deep checks on configuration, infrastructure…

1.5K installs
supabase-postgres-best-practices Shared topics
supabase/agent-skills

Postgres best practices maintained by Supabase, for Postgres running anywhere. Load this skill …

1.4K installs
webapp-testing Shared topics
anthropics/skills

Toolkit for interacting with and testing local web applications using Playwright. Supports veri…

904 installs
dart-resolve-package-conflicts Similar name
flutter/agent-plugins

Workflow for fixing package version conflicts. Use this when `pub get` fails due to incompatibl…

124 installs
resolving-merge-conflicts Similar name
mattpocock/skills

Use when you need to resolve an in-progress git merge/rebase conflict.

9 installs

Also in this package

Other skills from cursor/plugins · top by installs.

npx skills add https://github.com/cursor/plugins
unslop 401 thermo-nuclear-code-quality-review 105 deslop 83 typescript-best-practices 99 how 91 why 93 blast-radius 85 technical-writing 85 principle-encode-lessons-in-structure 79 principle-fix-root-causes 98

Browse all from cursor/plugins

More details

Agent compatibility

Declared targets from SKILL.md / docs. Unmarked agents are not listed — the skill may still install via the CLI.

Claude Code Not declared
Cursor Not declared
Codex Not declared
GitHub Copilot Not declared
Windsurf Not declared
Gemini CLI Not declared
Cline Not declared
OpenCode Not declared

Repository health

Stars 7.1K
License MIT
Default branch main
Open issues 39
Status Active

History

  1. First seen on skills.sh
  2. First recorded snapshot · 2,116 installs