Resolving Merge Conflicts

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

211 stars 13 forksGit & Code Review

Install

skills CLI (Claude Code, Cursor, Codex and more)
npx skills add iamyoki/qwen-image-2.1-skill --skill resolving-merge-conflicts
Manual install
git clone --depth 1 https://github.com/iamyoki/qwen-image-2.1-skill.git /tmp/qwen-image-2.1-skill
mkdir -p ~/.claude/skills
cp -r /tmp/qwen-image-2.1-skill/.agents/skills/resolving-merge-conflicts ~/.claude/skills/resolving-merge-conflicts

Personal skills live in ~/.claude/skills. Use .claude/skills in a project folder to share a skill with your team.

From the SKILL.md

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.
Read the full skill on GitHub

Details

Skill name
resolving-merge-conflicts
Path
.agents/skills/resolving-merge-conflicts/SKILL.md
License
Apache-2.0
Repo updated
22 September 2026
Copies
Found in 5 GitHub repos

FAQ

What does the Resolving Merge Conflicts skill do?

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

How do I install the Resolving Merge Conflicts skill?

skills CLI (Claude Code, Cursor, Codex and more): npx skills add iamyoki/qwen-image-2.1-skill --skill resolving-merge-conflicts. Skills go in ~/.claude/skills (personal) or .claude/skills (project), and Claude loads them automatically when a task matches the description.

Is Resolving Merge Conflicts popular?

It lives in iamyoki/qwen-image-2.1-skill, which has 211 GitHub stars and 13 forks, and is included in 2 curated skill lists.

Related skills

Improve Codebase Architecture

211

iamyoki/qwen-image-2.1-skill

Scan a codebase for deepening opportunities, present them as a visual HTML report, then grill through whichever one you pick.

Software DevelopmentIn 2 lists13

Teach

211

iamyoki/qwen-image-2.1-skill

Teach the user a new skill or concept, within this workspace.

Learning & EducationIn 2 lists13

Triage

211

iamyoki/qwen-image-2.1-skill

Move issues and external PRs through a state machine of triage roles, categorise, verify, grill if needed, and write agent-ready briefs.

Writing & ContentIn 2 lists13

Address Github Comments

514

Dokhacgiakhoa/Agent-Skills-4-Vibe-Coding-CLI

Use when you need to address review or issue comments on an open GitHub Pull Request using the gh CLI.

Git & Code Review146

Bisect Anything

517

dotslashsimran/simcraft

Find the exact commit (or dependency version, config value, or input) that caused a regression by turning it into an automatic pass/fail check and running git bisect run in a separate worktree, then shrink the bad commit to the hunk that matters and explain it. Handles failing tests, changed output, slowdowns, crashes, visual changes, server behaviour, flaky checks, unbuildable commits and merge-heavy history. Use when the user says "what broke this", "find the commit that", "when did this start", "it used to work", "regression", "git bisect", "which version broke it", or "which change made it

Git & Code Review39

00 Async Dev

564

ai-driven-dev/framework

Drive the async-dev pipeline from one entry point, whether setup, run, or review. Use when the user wants to install async dev, run a ready issue, or address PR review comments, or on a webhook trigger. Not for plain status checks.

Git & Code Review65

Browse the most popular Claude skills, all git & code review skills, or write your own with the skills generator.