Claude Skill

resolving-merge-conflicts

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

LLM Mart · 0 points · 0 0 0

Virus-scanned Reviewed automatically before listing.

Full trust report

Download gongyijie85-mattpocock-skills-dsh-skills_resolving-merge-conflicts-cddeded.zip · 0 KB

gongyijie85/mattpocock-skills-dsh 15 0 forks MIT Updated 14d ago

Part of gongyijie85/mattpocock-skills-dsh — 25 skills

Install

skills CLI npx skills add https://github.com/gongyijie85/mattpocock-skills-dsh/tree/main/skills/resolving-merge-conflicts

Claude Code

claude plugin marketplace add https://llmmart.ai/marketplace.json && claude plugin install gongyijie85-mattpocock-skills-dsh@llmmart

Git git clone https://github.com/gongyijie85/mattpocock-skills-dsh.git

The skills CLI installs just this skill, for any of its supported agents. Claude Code installs the whole gongyijie85/mattpocock-skills-dsh collection as a plugin from our marketplace. Git is the plain clone.

Skill manifest

See the current state of the merge/rebase. Check git history, and the conflicting files.
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.
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.
Discover the project's automated checks and run them, typically typecheck, then tests, then format. Fix anything the merge broke.
Finish the merge/rebase. Stage everything and commit. If rebasing, continue the rebase process until all commits are rebased.

Files (mattpocock-skills-dsh)

SKILL.md 918 B

---
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 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.