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.

Install to Claude Code

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