Verified record · from the answer index

resolve-merge-conflicts

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

skill:warpdotdev/common-skills/resolve-merge-conflicts · published by warpdotdev · source repository