What is resolving-merge-conflicts?
resolving-merge-conflicts is a Claude skill by mattpocock. It is listed under Engineering practice and has 550,900 installs.
| Type | Claude skill |
|---|---|
| Author | mattpocock |
| Repository | mattpocock/skills |
| Popularity | 550,900 installs |
| Category | Engineering practice |
| Security | Not scanned |
| Rank | #37 of 1,262 Claude skills; #9 in Engineering practice |
| License | MIT |
| Last commit | 2026-10-13 |
| Stars this week | +9,154 |
Is resolving-merge-conflicts safe to install?
We have not scanned resolving-merge-conflicts yet because its SKILL.md could not be fetched. Read the source before installing.
| Check | Result |
|---|
How do I install resolving-merge-conflicts?
- Install with the skills CLI. Works for Claude Code and other agents that read skills.
npx skills add https://github.com/mattpocock/skills --skill resolving-merge-conflicts
- Or copy it by hand. Claude Code loads any folder with a SKILL.md from ~/.claude/skills.
git clone https://github.com/mattpocock/skills cp -r skills/resolving-merge-conflicts ~/.claude/skills/resolving-merge-conflicts
- Use it. Claude loads the skill when a task matches its description. You can also name it in your prompt.
Use the resolving-merge-conflicts skill to …
Or ask Claude to set it up
Paste this into Claude Code and it installs resolving-merge-conflicts for you:
Install the "resolving-merge-conflicts" skill from https://github.com/mattpocock/skills into ~/.claude/skills, then tell me in one line what it does.
More from mattpocock/skills
This repository has at least 9 Claude skills on MCPMods.
- grill-me: A relentless interview to sharpen a plan or design. (Low risk)
- grill-with-docs: A relentless interview to sharpen a plan or design, which also creates docs (ADR's and glossary) as we go. (Low risk)
- improve-codebase-architecture: Scan a codebase for deepening opportunities, present them as a visual HTML report, then grill through whichever one you (Low risk)
- tdd: Test-driven development. Use when the user wants to build features or fix bugs test-first, mentions "red-green-refactor" (Low risk)
- setup-matt-pocock-skills: Configure this repo for the engineering skills: set up its issue tracker, triage label vocabulary, and domain doc layout (Low risk)
- handoff: Compact the current conversation into a handoff document for another agent to pick up. (Low risk)
- triage: Move issues and external PRs through a state machine of triage roles, categorise, verify, grill if needed, and write age (Low risk)
- prototype: Build a throwaway prototype to answer a design question. Use when the user wants to sanity-check whether a state model o (Low risk)