Resolve Merge Conflicts

Instead of dumping entire conflicted files into context, this extracts only the conflict hunks with surrounding lines and a compact diff between the two sides. You run the Python script to get a summary of all unmerged paths, then drill into individual files to see just the conflicting sections. It handles both marker-based text conflicts and index-only conflicts like add/add or modify/delete. The workflow keeps context tight by resolving one file at a time, which matters when you're dealing with a messy rebase across a dozen files. Honest take: this is the kind of tooling that should have existed years ago, because loading full files to see three lines of actual conflict is wasteful.

skills.sh installs: 28.8K
GitHub stars: 684
last updated: Aug 21, 2026

View on GitHub

Install

$ npx -y skills add warpdotdev/common-skills --skill resolve-merge-conflicts --agent claude-code

Installs into .claude/skills of the current project.

Files

Resolve Merge Conflicts

Overview

Resolve conflicts without opening full files unless the compact view is insufficient. Start with a summary, then inspect one conflicted file at a time.

Workflow

Start with a summary.

python3 .agents/skills/resolve-merge-conflicts/scripts/extract_conflict_context.py

Use the summary to identify which files are unresolved, which index stages exist, and how many text hunks each file contains.

Drill into one file.

python3 .agents/skills/resolve-merge-conflicts/scripts/extract_conflict_context.py --file path/to/file

Prefer this over reading the whole file. The script prints only nearby context, the ours / base / theirs sections for each hunk, and a compact unified diff between ours and theirs.

Resolve the file.

Take one side wholesale with git checkout --ours -- path/to/file or git checkout --theirs -- path/to/file when appropriate.
Otherwise edit the file directly and remove the conflict markers.
Read more of the file only if the compact output is not enough to decide the correct merge.