New: 98,000+ skills indexed from GitHub repos with 100+ stars · every skill safety-checkedBrowse top skillsTop skills
Esc to closeBrowse all skills
Submit a skillBrowse skills
Submit a skillBrowse skills

Official agent skill

Fix Merge Conflicts

by cursor in cursor/plugins

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

OfficialNo licenceAuto-check passedDevelopment

Install Fix Merge Conflicts

skills CLI
$ npx skills add cursor/plugins --skill fix-merge-conflicts -a claude-code

Project install by default; add -g for ~/.claude/skills/.

GitHub CLI
$ gh skill install cursor/plugins fix-merge-conflicts --agent claude-code

Project scope by default; add --scope user for a personal install. Needs GitHub CLI 2.90.0 or later (public preview).

Manual copy
$ git clone --depth 1 https://github.com/cursor/plugins.git skills-src && mkdir -p .claude/skills && cp -r skills-src/cursor-team-kit/skills/fix-merge-conflicts .claude/skills/fix-merge-conflicts && rm -rf skills-src

Use ~/.claude/skills/ instead of .claude/skills for a personal install. The folder must contain SKILL.md.

Claude Code skills documentation · loads skills from .claude/skills/

Facts

Skill name
fix-merge-conflicts
GitHub stars
10k
Used in
3 other repos
Token cost
~247 tokens
SKILL.md length
117 words
Files
1
Skills in repo
99
Repo updated
First seen
Licence
None found

At a glance

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

  • Works in 6 steps: Detect all conflicting files from git… → Resolve each conflict with minimal,… → Prefer preserving both sides when safe.… → …
  • Tasks that involve Git workflow
  • SKILL.md covers Trigger, Workflow, Guardrails and Output
  • Instructions only: no scripts, shell commands, URLs or credentials in SKILL.md

What it does

Fix Merge Conflicts is an agent skill from cursor/plugins, published by the product's own GitHub organization. Resolve merge conflicts non-interactively, validate build and tests, and finalize conflict resolution

Its SKILL.md is about 250 tokens, which your agent loads only when the skill is triggered. It is a single SKILL.md file with no bundled scripts.

It sits in Development, covering Git workflow. The repository describes itself as: Cursor plugin specification and official plugins.

When your agent uses it

  • Tasks that involve Git workflow

Example prompts

  • “/fix-merge-conflicts”

Workflow steps

6 steps, taken from the first numbered list in SKILL.md.

  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.

What it can do on your machine

Read from SKILL.md and the folder at commit ccb5507. It shows what the files ask for, not the result of running them.

  • Tool permissions

    Pre-approves nothing: there is no allowed-tools line, so your agent's usual permission prompts apply.

    From allowed-tools in the SKILL.md frontmatter.

  • Runs code

    No scripts in the folder and no shell commands in SKILL.md.

    From the folder's file list and the shell code blocks in SKILL.md.

  • Network

    No URLs in SKILL.md.

    From URLs in SKILL.md, links to its own repository left out.

  • Credentials

    Names no API keys, tokens, secrets or passwords.

    From names ending in _API_KEY, _TOKEN, _SECRET, _KEY or _PASSWORD in SKILL.md.

Context cost

Fix Merge Conflicts loads about 247 tokens when it runs. Until then it costs about 30 tokens; SKILL.md has 117 words of instructions outside code blocks.

Always · name and description, kept in context so the agent knows when to use it
~30
When it runs · the whole SKILL.md, loaded when a task matches
~247

Estimates: characters ÷ 4, the usual rule of thumb; real counts depend on the model's tokenizer. Scripts and assets cost tokens only if the agent reads them.

Safety

Auto-check passed

The automated check found no risky patterns in SKILL.md.

Automated static check — not a guarantee. Review scripts before installing. It scans the text of SKILL.md for risky patterns (piping downloads into a shell, reading credential files, hidden Unicode, destructive commands); files beside SKILL.md are not scanned.

SKILL.md

Without a licence we can't republish the file, so here is its outline and opening line. It has 117 words (~247 tokens).

“Branch has unresolved merge conflicts and needs a reliable path to a buildable state.”

— opening of SKILL.md by cursor
name
fix-merge-conflicts

Read the full SKILL.md on GitHub

Files

Just SKILL.md in cursor-team-kit/skills/fix-merge-conflicts of cursor/plugins.

Open the folder on GitHubat commit ccb5507

Used in 3 other repositories

We found 6 copies of this SKILL.md (exact, near-identical or edited) in other folders, from 3 other GitHub owners. This page covers the copy in cursor/plugins, which our catalogue first saw on October 7, 2026.

Compare with similar skills

Fix Merge Conflicts next to the 5 skills that share the most tags, products or categories with it. Stars are the repository's; “used in” counts other GitHub owners with a copy.

Fix Merge Conflicts compared with similar skills
SkillStarsUsed inTokensAuto-checkLicenceRepo updated
Fix Merge Conflicts this skillcursor/plugins10k3 repos~247Automated safety check: PassNone
Finishing a Development Branchobra/superpowers296k5 repos~1.9kAutomated safety check: PassMIT
Contributor-First PR MergeHKUDS/OpenHarness16k1 repos~847Automated safety check: PassMIT
Migrate Internal Package into GhostTryGhost/Ghost55k—~3.8kAutomated safety check: PassMIT
Create Pull Requestcline/cline70k1 repos~1.6kAutomated safety check: PassApache-2.0
Contextual Commit Messagesyamadashy/repomix29k1 repos~2.7kAutomated safety check: PassMIT

Similar skills

  • Finishing a Development Branch

    obra/superpowers

    Walks the last step of a branch: confirm tests pass, detect the git environment, ask how to integrate, carry out your choice and clean up the worktree.

    296k GitHub starsUsed in 5 repos~1.9k tokens
    DevelopmentAuto-check passed

  • Contributor-First PR Merge

    HKUDS/OpenHarness

    Merges external GitHub pull requests while keeping the original author credited, and fixes conflicts after the merge instead of rewriting the contribution.

    16k GitHub starsUsed in 1 repo~847 tokens
    DevelopmentAuto-check passed

  • Migrate Internal Package into Ghost

    TryGhost/Ghost

    Moves a package from another TryGhost repository into Ghost as an internal workspace package while keeping its Git history, with checkpoints for the steps that need an administrator.

    55k GitHub stars~3.8k tokensUpdated today
    DevelopmentAuto-check passed

  • Create Pull Request

    cline/cline

    Opens a GitHub pull request from your current branch with the gh CLI, after reviewing the commits and diff and gathering the details the PR needs.

    70k GitHub starsUsed in 1 repo~1.6k tokens
    DevelopmentAuto-check passed

  • Contextual Commit Messages

    yamadashy/repomix

    Writes Conventional Commits whose bodies carry action lines recording the intent, decisions and constraints behind a change, not only what changed.

    29k GitHub starsUsed in 1 repo~2.7k tokens
    DevelopmentAuto-check passed

  • Git Merge Conflict Resolver

    tailcallhq/forgecode

    Resolves Git merge conflicts with a plan-first workflow that keeps both sides' intent, regenerates lock files and backs up deleted-but-modified files.

    7.6k GitHub starsUsed in 1 repo~4.5k tokens
    DevelopmentAuto-check passed

More from cursor/plugins

All 99 skills in this repo

  • Show Me Your Work Decision Log

    cursor/plugins

    Official

    Keeps a TSV decision log for long or unattended agent runs, one row per decision with what, why, evidence and result, so a reviewer can check the work later.

    10k GitHub starsUsed in 9 repos~1.6k tokens
    Auto-check passed

  • Code Design Rationale Investigator

    cursor/plugins

    Official

    Digs into why code is shaped the way it is by checking git history, pull requests and connected tools in parallel, then reporting a cited read on the tradeoffs.

    10k GitHub starsUsed in 9 repos~2.6k tokens
    Auto-check passed

  • Reflect on Session Learnings

    cursor/plugins

    Official

    Starts three parallel reviewer subagents over the current conversation transcript, then turns their findings into concrete edits to existing skills.

    10k GitHub starsUsed in 5 repos~1.2k tokens
    Auto-check passed

  • Technical Writing Standard

    cursor/plugins

    Official

    Applies four layers of technical-writing rules to docs, RFCs, readmes, PR descriptions and commit messages so a tired engineer follows them on the first read.

    10k GitHub starsUsed in 10 repos~2.4k tokens
    Auto-check passed

  • Advisor Mode

    cursor/plugins

    Official

    Adds a second, stronger model that the main agent consults before major decisions, when stuck and before finishing, controlled by /advisor commands.

    10k GitHub stars~2.6k tokensUpdated today
    Auto-check: notes

  • Make PR Easy To Review

    cursor/plugins

    Official

    Prepare PRs for review by cleaning noisy history, improving PR descriptions, and adding reviewer guidance without changing code behavior.

    10k GitHub starsUsed in 3 repos~569 tokens
    Auto-check passed

Categories

Questions about Fix Merge Conflicts

What does Fix Merge Conflicts do?

Resolve merge conflicts non-interactively, validate build and tests, and finalize conflict resolution. Fix Merge Conflicts is an agent skill from cursor/plugins, published by the product's own GitHub organization.

When should I use Fix Merge Conflicts?

Fix Merge Conflicts fits situations like: tasks that involve Git workflow.

How do I install Fix Merge Conflicts in Claude Code?

Run `npx skills add cursor/plugins --skill fix-merge-conflicts -a claude-code`. Or copy the skill folder (cursor-team-kit/skills/fix-merge-conflicts in cursor/plugins) into .claude/skills/fix-merge-conflicts in your project. Claude Code loads it when a task matches its description.

How do I install Fix Merge Conflicts in Codex?

Run `npx skills add cursor/plugins --skill fix-merge-conflicts -a codex`. Or copy the skill folder (cursor-team-kit/skills/fix-merge-conflicts in cursor/plugins) into .agents/skills/fix-merge-conflicts in your project. Codex loads it when a task matches its description.

Can I use Fix Merge Conflicts in Cursor, Gemini CLI or GitHub Copilot?

Cursor, Gemini CLI, GitHub Copilot and OpenCode also load SKILL.md folders. With the skills CLI, run `npx skills add cursor/plugins --skill fix-merge-conflicts -a cursor` (or -a gemini-cli, github-copilot or opencode for the others). To copy it by hand, put the folder in .cursor/skills/fix-merge-conflicts, .gemini/skills/fix-merge-conflicts, .github/skills/fix-merge-conflicts and .opencode/skills/fix-merge-conflicts in your project.

What does Fix Merge Conflicts need to run?

SKILL.md names no scripts, command-line tools or credentials: Fix Merge Conflicts is instructions for the agent only.

Does Fix Merge Conflicts access the network?

SKILL.md contains no URLs. Any network use would come from the scripts or tools the agent runs. This is read from the text; nothing was executed.

Is Fix Merge Conflicts safe to install?

Our automated static check of SKILL.md found no risky patterns, such as piping downloads into a shell, reading credential files or hidden Unicode. It is not a guarantee. Review the folder before installing.

What licence does Fix Merge Conflicts use?

No licence was found for Fix Merge Conflicts or its repository. Without one, default copyright applies: ask the author before reusing or redistributing it.

How many tokens does Fix Merge Conflicts use?

About 247 tokens (SKILL.md is roughly 988 characters). Agents keep only the skill's name and description in context until a task matches; then they load SKILL.md in full.

What are the alternatives to Fix Merge Conflicts?

Skills that share tags, products or a category with Fix Merge Conflicts: Finishing a Development Branch (obra/superpowers, 296k stars), Contributor-First PR Merge (HKUDS/OpenHarness, 16k stars), Migrate Internal Package into Ghost (TryGhost/Ghost, 55k stars) and Create Pull Request (cline/cline, 70k stars). The comparison table on this page puts their stars, adoption, token cost, safety result and licence side by side.

Who maintains Fix Merge Conflicts?

cursor (a GitHub organization, an official publisher) maintains it in cursor/plugins, which has 10,278 GitHub stars. The repository holds 99 skills in this directory. The repository was last updated on October 8, 2026.

Source: cursor/plugins on GitHub. Facts on this page come from the repository at the commit we read; the author's words are quoted as theirs.