resolve-conflicts

Analyze and resolve Git merge/rebase conflicts intelligently, showing diffs and asking clarifying questions when needed. Invoke with /resolve-conflicts.

Quality

81%

Does it follow best practices?

Run evals on this skill

Adds up to 20 points to the overall score

View guide

Securityby

Passed

No findings from the security scan

Quality

Content

88%Weight 40%Scale 1-5

Reviews the quality of instructions and guidance provided to agents. Good implementation is clear, handles edge cases, and produces reliable results.

The skill body is a strong, fully executable workflow: concrete bash commands at every step, explicit validation checkpoints, rebase feedback loops, and abort paths. Only minor improvements are available — trimming generic advice in the Tips section and optionally moving question templates to a reference file.

Dimension	Reasoning	Score
Conciseness	The body is lean and command-first, assuming Git knowledge throughout (no explanations of what merge/rebase is), but the Tips and Recommendations sections include generic advice Claude doesn't need ('Small conflicts are easier: Merge frequently', 'consider better branch coordination'). Minor instances of over-explanation fit anchor 4 rather than the every-token-earns-its-place level of anchor 5.	4 / 5
Actionability	Every step gives copy-paste-ready bash commands with inline comments, covering detection ('git rev-parse --verify MERGE_HEAD'), three-way inspection ('git show :2:<file>'), resolution ('git checkout --ours <file>'), verification, commit, and abort. Commands are complete and executable, matching anchor 5.	5 / 5
Workflow Clarity	An 8-step sequence with explicit validation (Step 6 checks unmerged files and greps staged diffs for conflict markers), per-file marker checks before staging, error-recovery loops ('If more conflicts appear during rebase, repeat from Step 3'), and abort options. This matches anchor 5's explicit validation with feedback loops; it is well above anchor 4's 'minor validation gaps'.	5 / 5
Progressive Disclosure	A single well-organized file with clear headed sections and no nested or buried references, so navigation is easy. However, at ~240 lines with no bundle files, content such as the clarifying-question templates and summary examples could be split into references; structure is good with minor organization gaps, fitting anchor 4 rather than the appropriately-split content of anchor 5.	4 / 5
	Total	18 / 20 Passed

Description

66%Weight 40%Scale 1-5

Based on the skill's description, can an agent find and select it at the right time? Clear, specific descriptions lead to better discovery.

The description communicates a clear, well-scoped capability with mostly concrete actions and good natural keywords, and it is firmly distinct from other skill domains. Its main weakness is the absence of any 'Use when...' trigger guidance, which caps completeness, and the word 'intelligently' adds vague padding.

Suggestions

Add an explicit trigger clause, e.g., 'Use when the user mentions merge conflicts, rebase conflicts, or conflict markers, or asks to resolve conflicting changes in a Git repository.'

Remove the vague adverb 'intelligently' and instead name the concrete strategy (e.g., 'comparing ours/theirs/ancestor versions') so every phrase states an explicit capability.

Include common user phrasings like 'conflict markers' and 'resolve conflicts' as trigger terms to broaden natural keyword coverage.

Dimension	Reasoning	Score
Specificity	Names the domain ('Git merge/rebase conflicts') and several concrete actions ('showing diffs and asking clarifying questions'), but 'intelligently' is padding and coverage has minor gaps (e.g., no mention of preview mode or abort, both of which the skill supports). Clearly above the 1-2-action level of anchor 3, but not the comprehensive coverage of anchor 5.	4 / 5
Completeness	The 'what' is clear ('Analyze and resolve Git merge/rebase conflicts intelligently, showing diffs and asking clarifying questions') but there is no 'Use when...' clause or equivalent trigger guidance; 'Invoke with /resolve-conflicts' is invocation syntax, not a when-to-use condition. Per the judging guideline, a missing 'Use when...' clause caps completeness at 3.	3 / 5
Trigger Term Quality	Includes good natural keywords users would say ('Git merge/rebase conflicts', 'diffs', '/resolve-conflicts'), but misses common variations like 'conflict markers' or 'resolve git conflicts'. Good coverage per anchor 4, short of the comprehensive synonym coverage of anchor 5.	4 / 5
Distinctiveness Conflict Risk	Merge/rebase conflict resolution is a clear, specific niche distinct from generic git skills, with only minor overlap risk against adjacent git-workflow skills. It lacks the explicit trigger phrases that would fully earn anchor 5.	4 / 5
	Total	15 / 20 Passed

Validation

93%

Warnings & errors only

Checks the skill against the spec for correct structure and formatting. All validation checks must pass before discovery and implementation can be scored.

Validation — 15 / 16 Passed

Validation for skill structure

Criteria	Description	Result
relative_links	Relative link issues: 1 missing	Warning

	Total	15 / 16 Passed

Repository: mthines/agent-skills
Path: skills/delivery/resolve-conflicts/SKILL.md
Commit: 39b3f44

Reviewed: 22 hours ago

Table of Contents

Discovery Implementation Validation

Is this your skill?

If you maintain this skill, you can claim it as your own. Once claimed, you can manage eval scenarios, bundle related skills, attach documentation or rules, and ensure cross-agent compatibility.