Skip to content
Claude Skills

resolving-merge-conflicts: Claude Code skill

Summarize withChatGPT(opens in a new tab)Claude(opens in a new tab)Perplexity(opens in a new tab)Google AI(opens in a new tab)

What it does

Resolves a merge or rebase conflict by finding out why each side changed.

The description Claude matches your request against: Use when you need to resolve an in-progress git merge/rebase conflict.

When to use it

Git stopped a merge or rebase with conflicts.

How to start it

Automatic, or /resolving-merge-conflicts

Claude loads it by itself when your request matches, so you rarely need the command. The suggester plugin also points it out when it fits.

Install

resolving-merge-conflicts is part of the coding plugin. Install just that plugin in Claude Code:

/plugin marketplace add iatee/claude-skills
/plugin install coding@iatee-skills
/reload-plugins

Or install the whole collection:

/plugin marketplace add iatee/claude-skills
/plugin install all@iatee-skills
/reload-plugins

New to this? Using skills explains what a skill is and how installing works.

Credit

Made by Matt Pocock, licensed MIT. Claude Skills is an unofficial, personal collection, not affiliated with or endorsed by Anthropic.

  • code-review: Reviews changes on two axes: your repo's coding standards and what the spec asked for.
  • codebase-design: Shared vocabulary for designing deep modules with small interfaces.
  • diagnosing-bugs: Reproduces a hard bug with one failing command before fixing it, then adds a regression test.
  • implement: Builds a spec or ticket test-first, then reviews and commits it.
  • implement-spec: Builds a whole spec with parallel sub-agents and opens one pull request.
  • improve-codebase-architecture: Scans a codebase for places to simplify and shows them as a visual report.
  • playwright-cli: Drives a real browser from the terminal: open pages, click, fill forms, take screenshots.
  • setup-pre-commit: Adds Husky pre-commit hooks for formatting, type checks and tests.
  • tdd: Test-driven development, one red-green step at a time.
  • wizard: Writes an interactive script that walks you through steps only a human can do.

All skills in the catalog

An unofficial, personal collection. Not affiliated with or endorsed by Anthropic.PrivacyMade by Iago García Bärtsch