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.
Install
npx skills add warpdotdev/common-skills --skill resolve-merge-conflictsnpx skills add warpdotdev/common-skills --skill resolve-merge-conflicts -a claude-code -gnpx skills add warpdotdev/common-skills --skill resolve-merge-conflicts -a codex -ggemini skills install https://github.com/warpdotdev/common-skills.git --path .agents/skills/resolve-merge-conflictsgh skill install warpdotdev/common-skills resolve-merge-conflictsgit clone --depth 1 https://github.com/warpdotdev/common-skills /tmp/warpdotdev__common-skills
mkdir -p ~/.claude/skills ~/.agents/skills
cp -R /tmp/warpdotdev__common-skills/.agents/skills/resolve-merge-conflicts ~/.claude/skills/resolve-merge-conflicts # Claude Code
cp -R /tmp/warpdotdev__common-skills/.agents/skills/resolve-merge-conflicts ~/.agents/skills/resolve-merge-conflicts # Codex, Cursor, Gemini CLI, Copilot, OpenCode