OverviewHistoryStatsSecurity
npx skills add ...
Documentation
SKILL.md
npx skills add warpdotdev/common-skills --skill 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 unmerged paths, or when files contain conflict markers.
npx skills add warpdotdev/common-skills --skill resolve-merge-conflicts
Resolve conflicts without opening full files unless the compact view is insufficient. Start with a summary, then inspect one conflicted file at a time.
Use the summary to identify which files are unresolved, which index stages exist, and how many text hunks each file contains.
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.
git checkout --ours -- path/to/file or git checkout --theirs -- path/to/file when appropriate.<<<<<<<, =======, or >>>>>>> markers remain in the resolved files.