🎯

fix-merge-conflicts

🎯Skill

from cursor/plugins

What it does

An official Cursor plugin for resolving merge conflicts, part of the Cursor plugins repository that provides standalone plugins with agent skills and rules for popular developer tools and frameworks.

📦

Same repository

cursor/plugins(7 items)

fix-merge-conflicts

Installation

Vibe Index InstallInstalls to .claude/skills/ - auto-recognized by Claude Code

npx vibeindex add cursor/plugins --skill fix-merge-conflicts

skills.sh Install⚠ Installs to .agents/skills/ - may not be auto-recognized by Claude Code

npx skills add cursor/plugins --skill fix-merge-conflicts

Manual InstallCopy SKILL.md content and save to the path below

~/.claude/skills/fix-merge-conflicts/SKILL.md

SKILL.md

92Installs

AddedFeb 18, 2026

View on GitHub Back to Skills

More from this repository6

🎯

deslop🎯Skill

Skill for removing sloppy or low-quality code from Cursor plugins, a marketplace of official plugins for popular developer tools including frontend, design, data science, code review, and documentation workflows.

🎯

continual-learning🎯Skill

An official Cursor plugin for incremental transcript-driven AGENTS.md memory updates with high-signal bullet points, part of the Cursor plugins collection that includes tools for teaching, team workflows, plugin creation, and iterative AI loops.

🎯

check-compiler-errors🎯Skill

Quickly identifies and explains compiler errors across multiple programming languages, providing clear debugging insights and potential fix suggestions.

🎯

loop-on-ci🎯Skill

Automates continuous integration workflows by dynamically generating and executing parallel test or build jobs across multiple configurations

🎯

what-did-i-get-done🎯Skill

Tracks and summarizes daily work progress by analyzing code commits, task completions, and project contributions.

🎯

review-plugin-submission🎯Skill

Skill