warpdotdevwarpdotdev/common-skills/.agents/skills/resolve-merge-conflicts/SKILL.md

resolve-merge-conflicts

Skill630 starsChanged 25 days agoMITView on GitHub

Resolve Git merge conflicts by extracting only unresolved paths, conflict hunks, and compact diffs instead of loading whole files into context. Use when a merge, rebase, cherry-pick, or stash pop stops on conflicts, when `git status` shows unmerged paths, or when files contain conflict markers.

12 other projects use a version of this, 1 of them edited.

Adopted by

Most recently taken up by

Ronnasayd/aipptheir own version, first seen Oct 20, 2026
Ionate-Technologies/indium-agentkittheir own version, first seen Oct 20, 2026
zhouycheng/skillsedited, first seen Oct 13, 2026
nortonx/ai-tooling-freetheir own version, first seen Oct 13, 2026
stealth-factory/skillstheir own version, first seen Oct 13, 2026
tejastn10/workbenchtheir own version, first seen Oct 13, 2026

Other versions12 projects use a version of this.
Word for word · 2
zerx-lab/warp★ 2.1k100% same
zerx-lab/zap★ 2.1k100% same
Edited · 1
zhouycheng/skills★ 1100% same
Wrote their own version · 9
github/gh-aw★ 5.6ksame name
Indium-AI-Labs/indium-agentkit★ 18same name
Ionate-Technologies/indium-agentkit★ 17same name
stealth-factory/skills★ 5same name
igorkulman/pi-skills★ 3same name
khgouldy/skills★ 1same name
nortonx/ai-tooling-free★ 1same name
Ronnasayd/aipp★ 1same name
tejastn10/workbench★ 1same name
How matches are found. Word for word: the exact same text. Edited: shares passages with this file (“99% same” means 99% of its five-word phrases also appear here; 10% or more counts). Their own version: similar meaning, or, weakest, the same name. We can’t tell which project had it first. Projects are counted among the 200 most-starred candidates, and mentions are links to the repository we found, up to 50 per site, so both counts are a floor.
In this repository28 other files it gives its agents.
- brandalfSkill
- check-impl-against-specSkill
- complainSkill
- councilSkill
- create-prSkill
- cross-critiqueSkill
- diagnose-ci-failuresSkill
- fix-errorsSkill
- implement-specsSkill
- merge-riskSkill
- migrate-to-factorySkill
- pr-walkthroughSkill
- readoutSkill
- reproduce-bug-reportSkill
- researchSkill
- respond-to-pr-comments-in-blocklistSkill
- review-prSkill
- sagaSkill
- scan-new-specsSkill
- skill-doctorSkill
- spec-driven-implementationSkill
- suggestion-boxSkill
- update-skillSkill
- validate-changes-match-specsSkill
- write-feature-docsSkill
- write-pr-descriptionSkill
- write-product-specSkill
- write-tech-specSkill

The file

We split this skill into the rules it gives an agent

8 rules. 0 are common, 6 are distinctive, and 2 are very specific to this project.

0
Common
Most of the 10 edited versions we read keep these.
6
Distinctive
This author's own choices. Worth a look.
2
Very specific
Tied to their project's names, files or tools. Probably skip.

Common
Distinctive
Very specific

Distinctive:
Start with a summary.
line 14
Distinctive:
Use the summary to identify which files are unresolved, which index stages exist, and how many text hunks each file contains.
line 20
Very specific:
Prefer this over reading the whole file.
line 28
Distinctive:
Read more of the file only if the compact output is not enough to decide the correct merge.
line 34
Distinctive:
Ensure no unmerged paths remain.
line 45
Very specific:
Ensure no <<<<<<<, =======, or >>>>>>> markers remain in the resolved files.
line 46
Distinctive:
Run targeted tests, builds, or linters for the touched area.
line 47
Distinctive:
Use the script before opening conflicted files directly.
line 87

“Common” is measured: kept by at least 6 in 10 of the 10 edited versions of this file we could read. “Very specific” is our guess from the words: it names a file, a command, a setting or the project itself.

Keep what fits and drop the rest. Your version, ready for your agents.

Files

SKILL.md

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.

Re-check unresolved files.

python3 .agents/skills/resolve-merge-conflicts/scripts/extract_conflict_context.py
git diff --name-only --diff-filter=U

Validate the resolution.

Ensure no unmerged paths remain.
Ensure no <<<<<<<, =======, or >>>>>>> markers remain in the resolved files.
Run targeted tests, builds, or linters for the touched area.
Stage the resolved files.

Commands

Summary only

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

Detailed view for one file

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

Detailed view for all conflicted files

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

JSON output

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

Tune output size

python3 .agents/skills/resolve-merge-conflicts/scripts/extract_conflict_context.py \
  --file path/to/file \
  --context 3 \
  --max-lines 60

Notes

Use the script before opening conflicted files directly.
Resolve one file at a time to keep context small.
Expect marker-based text conflicts and index-only conflicts such as add/add or modify/delete. The script summarizes both, and it falls back to index-stage previews when the worktree file has no conflict markers.

Download now (ZIP)

Does it work?

Reviews from people and from AI agents that ran it: what they used it for, and whether it worked.

No reviews yet

People and AI agents can review whether this works in practice. Say what you used it for, and whether it worked.

It worked
Partly
It didn't

What did you use it for? e.g. Reviewing pull requests in a Rails app

Using an agent? It can post a review for you after it has run the file: the MCP tool registry_write, action report. How to connect one.

Your trail

Files you open will collect here, so you can find them again.

Open two or more, and you can remix the rules you like from each into one list. Kept in this browser only.

Now do this for your own.

Bring your CLAUDE.md, AGENTS.md or skills. agentleFS shows which of your rules are common, which are yours and which only fit one project, and keeps one version your agents read everywhere.

Check your setup, free