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.

Quality

96%

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

92%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 body is a tight, actionable workflow with explicit validation checkpoints and a real bundled script for the heavy lifting. Its only weakness is mild command repetition between the Workflow and Commands sections.

Suggestions

Remove the duplicated summary and --file command blocks from the Commands section, or consolidate Workflow and Commands so each invocation appears once (the Commands section can then focus only on the additional flags like --all, --json, --context).

Consider a one-line pointer to the script's --help or a brief note that --all/--json/--context exist, rather than re-listing the base invocations.

Dimension	Reasoning	Score
Conciseness	Mostly lean and efficient with no over-explanation of git concepts, but the Commands section repeats the summary and --file invocations already shown in the Workflow, which is minor padding.	4 / 5
Actionability	Fully executable, copy-paste-ready commands covering the common cases — summary, single-file, --all, --json, and --context/--max-lines tuning — with concrete git checkout commands for resolution.	5 / 5
Workflow Clarity	Clear five-step sequence with explicit validation (step 5: ensure no unmerged paths, no markers, run tests, stage) and a re-check feedback loop (step 4), satisfying the destructive/batch validation requirement.	5 / 5
Progressive Disclosure	Well-organized into Overview/Workflow/Commands/Notes sections with the heavy extraction logic delegated one level deep to the bundled scripts/extract_conflict_context.py (verified present), keeping the body a lean overview.	5 / 5
	Total	19 / 20 Passed

Description

100%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 is exemplary: it states concrete capabilities, gives comprehensive natural trigger terms, answers both what and when explicitly, and is clearly distinct from other skills. It uses third-person voice with no fluff or over-claims.

Dimension	Reasoning	Score
Specificity	Lists multiple concrete actions — "extracting only unresolved paths, conflict hunks, and compact diffs instead of loading whole files into context" — giving comprehensive coverage of what the skill does.	5 / 5
Completeness	Explicitly answers both what ("Resolve Git merge conflicts by extracting...") and when ("Use when a merge, rebase, cherry-pick, or stash pop stops on conflicts...") with concrete trigger phrases.	5 / 5
Trigger Term Quality	Covers the natural phrases developers say — "merge, rebase, cherry-pick, or stash pop stops on conflicts", "git status shows unmerged paths", "files contain conflict markers" — with synonyms and concrete git states.	5 / 5
Distinctiveness Conflict Risk	Occupies a clear niche (git conflict resolution via compact extraction) with distinct, specific triggers and minimal overlap risk with other skills.	5 / 5
	Total	20 / 20 Passed

Validation

100%

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 — 16 / 16 Passed

Validation for skill structure

No warnings or errors.

Repository: warpdotdev/common-skills
Path: .agents/skills/resolve-merge-conflicts/SKILL.md
Commit: 69b4753

Reviewed: 5 days 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.