skill

Resolving Merge Conflicts

Use when you need to resolve an in-progress git merge/rebase conflict.

mattpocock553,373+ installsVetted

About

1. **See the current state** of the merge/rebase. Check git history, and the conflicting files.

2. **Find the primary sources** for each conflict. Understand deeply why each change was made, and what the original intent was. Read the commit messages, check the PRs, check original issues/tickets.

3. **Resolve each hunk.** Preserve both intents where possible. Where incompatible, pick the one matching the merge's stated goal and note the trade-off. Do **not** invent new behaviour. Always resolve; never `--abort`.

4. Discover the project's **automated checks** and run them, typically typecheck, then tests, then format. Fix anything the merge broke.

5. **Finish the merge/rebase.** Stage everything and commit. If rebasing, continue the rebase process until all commits are rebased.

Install

Run this command

npx skills add mattpocock/skills

Works with

claude appclaude codeclaude apicursorcodexwindsurfclinezed

Manual steps

Install with `npx skills add mattpocock/skills`, or clone the repository and copy the `skills/engineering/resolving-merge-conflicts` folder into your Claude skills directory.

View source
By mattpocock

Frequently asked questions

What is the Resolving Merge Conflicts skill?

Use when you need to resolve an in-progress git merge/rebase conflict.

How do I install Resolving Merge Conflicts?

Run this in your terminal:

npx skills add mattpocock/skills
Which AI tools does Resolving Merge Conflicts work with?

It works with claude_app, claude_code, claude_api, cursor, codex, windsurf, cline, zed.

Who made Resolving Merge Conflicts?

mattpocock.

Is Resolving Merge Conflicts free?

Yes, it is free to use.

Related assets

More curated picks in Productivity & Office.

All Resolving Merge Conflicts alternatives →
skillclaude_appclaude_codeclaude_api
npx skills add vercel-labs/skills
Find Skills
Helps users discover and install agent skills when they ask questions like "how do I do X", "find a skill for X", "is there a skill that can...", or e…3,611,572+
skillclaude_appclaude_codeclaude_api
npx skills add mattpocock/skills
Improve Codebase Architecture
Scan a codebase for deepening opportunities, present them as a visual HTML report, then grill through whichever one you pick.1,008,430+
skillclaude_appclaude_codeclaude_api
npx skills add mattpocock/skills
Handoff
Compact the current conversation into a handoff document for another agent to pick up.883,862+
skillclaude_appclaude_codeclaude_api
npx skills add mattpocock/skills
Triage
Move issues and external PRs through a state machine of triage roles, categorise, verify, grill if needed, and write agent-ready briefs.854,841+
skillclaude_appclaude_codeclaude_api
npx skills add mattpocock/skills
Teach
Teach the user a new skill or concept, within this workspace.724,817+
skillclaude_appclaude_codeclaude_api
npx skills add genmedia-labs/skills
Video Edit
Edit existing video on RunComfy — this skill is a smart router that matches the user's intent to the right edit model in the RunComfy catalog. Picks W…719,176+

Audit before you install

Run any source through our checks - AI visibility, security, performance, and stack detection.

Automated Web Security Scan

security

PageSpeed Analyzer

performance

AI Content Quality Test

arabic content

AI Agent / MCP Server Tester

ai testing

Site Stack Detector

migration

AI SEO / AEO / GEO Audit

ai visibility

llms.txt Generator

ai visibility

Readability Score

arabic content

Schema / JSON-LD Builder

ai visibility

AI Cost Calculator

ai testing

Headline Analyzer

arabic content

More in Productivity & Office