Conciseness

The body is dense, project-specific policy with no padding — e.g. the terse inspection block 'git status / git ls-files -u' and the rule 'Machine-generated / filtered state files ... keep ours'. However, 'For 3-way markers (`<<<<<<<` / `|||||||` / `=======` / `>>>>>>>`), select the intended side and delete the marker lines' restates conflict-marker syntax Claude already knows and partially duplicates the preceding sentence — a minor instance of over-explanation that could be trimmed, matching anchor 4 rather than 5.

Actionability

Fully executable, copy-paste-ready commands throughout: 'git ls-files -u', 'git show :1:<path>' / ':2:' / ':3:', 'git checkout --ours <path>', 'git add <path>', 'git diff --check', 'git rebase --continue', 'git cherry-pick --continue'. The per-file resolution rules ('keep the higher version; if already upstream, `--skip` the commit'; 'drop duplicates and obviously bogus rows') are concrete policy covering the common cases. Anchor 5.

Workflow Clarity

Eight clearly numbered steps (inspect -> examine stages -> resolve -> stage -> verify -> continue -> commit -> report) with an explicit validation checkpoint and feedback loop: 'Verify no conflict markers remain: git diff --check. If any remain, fix before continuing.' Conditional branches cover each pending operation (merge/rebase/cherry-pick/revert/stash) and the clean-tree case. Anchor 5; the destructive-operation cap does not apply because validation is present. Not 4: the validate-and-fix loop is explicit, not just a bare 'verify' step.

Progressive Disclosure

Single-file skill with no bundle files (no references/, scripts/, or assets/ exist); everything present belongs inline and is well organized under a one-line overview, a numbered 'Workflow' section, and 'Notes'. The only external pointer — '(see `git-commit` skill)' for commit conventions — is clearly signaled and one level deep. Clear overview, trivially easy navigation: anchor 5.

Specificity

Quotes: 'Resolve unmerged paths from a pending merge, rebase, cherry-pick, or stash pop, then continue the operation and commit.' Several concrete actions (resolve unmerged paths, continue the operation, commit) across enumerated conflict contexts, matching anchor 4 ('several specific actions; minor gaps'). Not 5: coverage is not fully comprehensive — the skill body also handles revert, which the description omits. Not 3: it goes well beyond 1-2 actions.

Completeness

Quotes: 'Resolve unmerged paths ... then continue the operation and commit' (clear what) and 'Use when invoked as `$git-resolve-conflicts` or when the user asks to resolve conflicts and commit' (explicit when with concrete trigger phrases). This is a direct anchor 5 match; not 4 because the when-clause is fully explicit rather than merely present.

Trigger Term Quality

Quotes: 'Use when invoked as `$git-resolve-conflicts` or when the user asks to resolve conflicts and commit.' 'resolve conflicts' and 'commit' are natural user phrases and the explicit skill-name trigger is given, matching anchor 4 ('good keyword coverage; a few natural terms missing'). Not 5: common synonyms such as 'merge conflict', 'fix conflicts', or 'conflict markers' are absent.

Distinctiveness Conflict Risk

Quotes: 'Resolve unmerged paths from a pending merge, rebase, cherry-pick, or stash pop' — a clear niche (conflict resolution for pending git operations) with distinct triggers and minimal overlap risk against related skills like commit-message generation. Matches anchor 5; not 4 because the scope is unambiguously specific.