resolve-merge-conflicts

warpdotdev/common-skills

SkillLoads cleanly

Resolve Git merge conflicts by extracting only unresolved paths, conflict hunks, and compact diffs instead of loading whole files into context. Use when a…

Scores
out of 100 · grade A

2026-08-22

Works

40% of the score

100/100

Loads cleanly: valid frontmatter, required fields present, no dangling references.

Maintained

25% of the score

100/100

no commits in the last 12 weeks

Adopted

20% of the score

59/100

22,185 installs on skills.sh.
171 stars on the source repo.

Documented

15% of the score

74/100

323-word body.
Ships 1 bundled file.

Loads cleanly. Every structural check Claude Code needs to register this passed. Last commit today.

Install

npx skills add warpdotdev/common-skills/resolve-merge-conflicts

What it says it does

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.

Every number above came out of reading the file and its repository. Nothing is a judgement call, nothing is a model’s opinion, and nothing can be paid for. The full method is published. Source last committed 2026-08-22.

Also in warpdotdev/common-skills

Other artifacts published from the same repository.
Artifact	What the check found	Type	Reach	Last commit
pr-walkthroughwarpdotdev/common-skills	clean	Skill	21,734 installs	today
readoutwarpdotdev/common-skills	clean	Skill	11,241 installs	today
review-prwarpdotdev/common-skills	clean	Skill	22,409 installs	today
sagawarpdotdev/common-skills	clean	Skill	14,332 installs	today
create-prwarpdotdev/common-skills	clean	Skill	22,116 installs	today
reproduce-bug-reportwarpdotdev/common-skills	clean	Skill	20,475 installs	today

Other git & workflow skills

Browse all

Same category, same type, ranked by score.
Artifact	What the check found	Category	Reach	Last commit
finishing-a-development-branchobra/superpowers	clean	Git & workflow	167,156 installs	2 days ago
using-git-worktreesobra/superpowers	clean	Git & workflow	170,252 installs	2 days ago
git-guardrails-claude-codemattpocock/skills	clean	Git & workflow	252,653 installs	today
github-issuesgithub/awesome-copilot	clean	Git & workflow	14,854 installs	today
setup-pre-commitmattpocock/skills	clean	Git & workflow	245,932 installs	today
commitmicrosoft/vscode	clean	Git & workflow	189k stars	today

Put this measurement in your README

A badge carrying how many listings this index holds from the repository and how many pass every static structural check. It reads from this index every time somebody loads your page, so it changes when the measurement changes and there is nothing to keep up to date. Free, no account, and the value is not something you or we can set by hand.

[![SkillWorks](https://toolproof.kynth.studio/badge/skillworks/warpdotdev/common-skills.svg)](https://skillworks.kynth.studio/?q=warpdotdev%2Fcommon-skills)

Would rather not hotlink us? Every badge is also served in shields.io’s endpoint schema, so shields renders the image and your readers never talk to our domain:

Published by Toolproof, the masthead over this index and eight others. The method behind the number is at toolproof.kynth.studio/methodology, and the whole thing is readable as JSON with no key at /api.