resolve-merge-conflicts skill (Warp): fix Git conflicts from compact hunks

Warp's skill that makes your agent resolve Git merge conflicts from compact hunks instead of loading whole files.

Installs: 28.7K; on skills.sh
Stars: 644; on GitHub
Files: 1; besides SKILL.md
Updated: Oct 2026; last repo commit

resolve-merge-conflicts loads when a merge, rebase, cherry-pick or stash pop stops on conflicts, when git status shows unmerged paths, or when files contain conflict markers. Your agent runs a bundled Python script that lists the unresolved files, then shows one file at a time: the nearby context, the ours, base and theirs sections of each hunk, and a compact diff between ours and theirs.

It then resolves the file, either by taking one side wholesale or by editing out the markers, re-checks that no unmerged paths or markers remain, runs targeted tests or builds, and stages the resolved files. It needs Python 3 and Git in the repo.

Good for

Developers stuck in a merge, rebase, cherry-pick or stash pop with unmerged files
Anyone whose agent runs out of context when it opens large conflicted files
Teams that want conflicts fixed one file at a time and then tested

Install resolve-merge-conflicts

Claude Code

Copy this prompt.

Install the resolve-merge-conflicts skill in Claude Code. Run this command:

npx skills add https://github.com/warpdotdev/common-skills --skill resolve-merge-conflicts

Then check that it loaded and tell me how to use it.

2
Paste it into Claude Code. It shows the change and asks before running it.

Requires Node.js.

From its listing on skills.sh. Source.

What's in the skill

When it loads

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.

Sections in SKILL.md

Overview
Workflow
Commands
Summary only
Detailed view for one file
Detailed view for all conflicted files
JSON output
Tune output size
Notes

Key facts

Author: Warp (warpdotdev/common-skills repo)
Installs on skills.sh: 28,652 as of 2026-11-02
GitHub stars: 644 for the whole common-skills repo, 2026-11-02
License: MIT (from GitHub repo data)
Last repo commit: 2026-10-28
Files: 2 files including SKILL.md: scripts/extract_conflict_context.py
Part of: Warp's common-skills repo, shared skills the README says may still contain Warp-specific wording

What it includes

Lists unresolved files, index stages and hunk counts
Runs the script with no arguments to see which files are unresolved before opening any of them.
Try: “My rebase stopped on conflicts. Use resolve-merge-conflicts and start with the summary.”
Runs code · Summary
Detailed view of one conflicted file
Prints only nearby context, the ours, base and theirs sections of each hunk, and a compact unified diff between ours and theirs.
Runs code · --file <path>
Detailed view for every conflicted file
Runs code · --all
Machine-readable output
Runs code · --json
Tune how much context and how many lines per hunk
Runs code · --context and --max-lines
Take ours or theirs, or edit out the markers
SKILL.md suggests git checkout --ours or --theirs for a whole file, or direct edits that remove the conflict markers.
Runs code · Resolve the file
No unmerged paths or markers left; run tests; stage files
Re-runs the script and git diff --name-only --diff-filter=U, checks for <<<<<<<, ======= and >>>>>>> markers, runs targeted tests or builds, then stages the resolved files.
Runs code · Validate

From the official docs

Permissions

Medium risk

Your agent edits and stages files in the middle of a merge. Work on a branch you can reset and read each resolution before committing.

What it can do

Read your data
Create and change things
Delete things
Read-only mode

Watch out for

It rewrites conflicted files and stages them
Taking ours or theirs replaces the whole file with one side. Work on a clean tree or a branch so you can undo it, and read the result. github.com
A wrong pick can drop changes
Resolving by taking one side can discard the other side's edits. Check the tests the skill asks for before you commit. github.com

Technical details

Scopes	Runs a Python script that calls git in your repo Overwrites or edits conflicted files and stages them

Questions

What does the resolve-merge-conflicts skill do?

It guides your agent through resolving Git conflicts using a script that prints only the conflicting hunks, one file at a time. The aim is to save context compared with opening whole files.

How do I install it in Claude Code, the Claude app or Codex?

Use the install box at the top of this page. SKILL.md runs the script at .agents/skills/resolve-merge-conflicts/scripts/extract_conflict_context.py, so the skill should sit in that folder of your repo. If it is installed elsewhere, the agent has to adjust the path.

Does it need an API key?

No key appears in SKILL.md or the script. It needs Git, and python3 to run the script.

Is it safe?

It changes your files. SKILL.md has the agent take one side with git checkout --ours or --theirs, edit files, and stage them, so commit or stash other work first and read each resolution. The script itself runs Git commands such as ls-files and show to read index stages.

Does it commit or push?

SKILL.md ends at staging the resolved files. It does not mention committing or pushing.

What kinds of conflicts does it handle?

SKILL.md says it covers marker-based text conflicts and index-only conflicts such as add/add or modify/delete, falling back to index-stage previews when the file has no markers.

Information

updated Nov 2, 2026

Repository: warpdotdev/common-skills
Folder: .agents/skills/resolve-merge-conflicts

warpdotdev/common-skills skills.sh

Sources

Docs, issue trackers and discussions this page is built from.

Show all 4

resolve-merge-conflicts SKILL.md · github.com
scripts/extract_conflict_context.py · github.com
common-skills README · github.com
skills.sh listing · skills.sh