fix-merge-conflicts

An agent skill by cursor, from cursor/plugins. Tags: debugging, git, merge, validation, version-control.

What it does

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

Install

With the skills CLI, which installs into Claude Code, Codex, Cursor and other agents:

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

Or copy the skill folder into Claude Code's skills directory by hand (~/.claude/skills for every project, or .claude/skills inside one):

git clone --depth 1 https://github.com/cursor/plugins
cp -r plugins/cursor-team-kit/skills/fix-merge-conflicts ~/.claude/skills/fix-merge-conflicts

Safety box score

Grade B, low risk: 11 of 100 risk points, rated 2026-10-20. The grade rates what the skill and its scripts can reach on the machine of whoever installs it, across eight categories from shell execution to secrets access. How the score works.

This skill only describes resolving git merge conflicts inside a repository, then running build/test checks and staging the results. The main risks are ordinary code changes and command execution in the working tree; it does not ask for secrets, elevated privileges, or pushing to remote systems.

Category levels, from 0 (none) to 3 (high)
Category	Level	Why
Code & shell execution	1 (low)	It explicitly tells the agent to "Run compile, lint, and relevant tests" and to use package manager tools, so it can execute project commands in the repo.
Network access	0 (none)	No remote downloads, API calls, or network destinations are mentioned anywhere in the skill.
Filesystem reach	1 (low)	It resolves conflict files and says to "Stage resolved files," which means modifying the repository working tree but not system paths.
Secrets & credentials	0 (none)	The skill does not request tokens, passwords, key files, `.env` data, or other credentials.
Privilege & persistence	0 (none)	There is no sudo, global install, service registration, shell/profile editing, or other privilege-changing behavior.
Instruction hijack surface	0 (none)	The skill does not instruct the agent to ignore rules, hide actions, or follow external instructions.
Irreversible actions	1 (low)	It performs conflict resolution and staging non-interactively, but explicitly says "Do not push or tag during conflict resolution."
Transparency	0 (none)	The only file is plain text Markdown; there are no binaries, blobs, or dynamically fetched installers.

Before installing

Read `SKILL.md` and confirm it only operates in the repo working tree.
Run it on a throwaway branch first so you can inspect the resolved diff before accepting it.
Check the repository's build/test commands to ensure they do not invoke unexpected scripts.
Verify there are no companion scripts or binaries in the skill package beyond the Markdown file.

Rated 2026-10-20 by an automated review of 1 file from the skill's repository.

Source

Repository: cursor/plugins (all skills from this repository)
Path: cursor-team-kit/skills/fix-merge-conflicts/SKILL.md
Branch: main
Collection: cursor
Updated: 2026-09-23

blast-radius — Find what a change could break somewhere else before it ships, beyond the diff.
check-compiler-errors — Run compile and type-check commands and report failures
control-cli — Build or adapt a local harness to drive, inspect, and profile an interactive CLI or TUI without external services.
control-ui — Build or adapt a local browser/CDP harness to drive and inspect a web, IDE, or Electron UI.
debug-voice — Use when the user runs /debug-voice, says voice mode has flaws, asks to see or capture what happened in a Grok realtime voice session.
fix-ci — Find failing PR checks, inspect logs or external check links, and apply focused fixes