Cookies

With your permission, we use Google Analytics cookies to measure visits and improve the site. Necessary cookies are always on. You can change your choice or withdraw consent anytime in the footer, under Cookie settings. Cookie Policy

Skip to content
PTEN
Get started

resolving-merge-conflicts

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

  • Skills
  • Engineering
  • 0

What it does and how to use it

A skill that teaches Claude Code to do engineering tasks well. It is packaged knowledge the model uses whenever it is relevant.

  1. Install the skill (command above).
  2. In Claude Code, describe what you need - the skill turns on by itself when the context fits.
  3. No commands to memorize: you talk in plain language and the skill does the rest.

Install (Claude Code)

mkdir -p .claude/skills/mattpocock-skills__resolving-merge-conflicts && curl -fsSL https://doutorai.pt/data/lib/skills__mattpocock-skills__resolving-merge-conflicts.md -o .claude/skills/mattpocock-skills__resolving-merge-conflicts/SKILL.md

Paste this command into the terminal, in your project folder, and the component installs automatically.

Content

---
name: resolving-merge-conflicts
description: "Use when you need to resolve an in-progress git merge/rebase conflict."
---

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 ne

- 🔒 Full content on the Pro plan (€7.99/month) -

Need help with Claude Code?

Ask Dr AI - it explains things simply.

Need a tailor-made solution?

Not sure where to start with AI in your business? Get a free assessment and a tailored plan - no commitment.

Save hours every week with AI, no hassle

Doutor AI gives you 1,859 ready-to-copy AI prompts, by industry and in plain English - plus a complete technical library for those who want to go further.

See plans