Resolve merge conflicts non-interactively, validate build and tests, and finalize conflict resolution
55
61%
Does it follow best practices?
Impact
—
No eval scenarios have been run
Passed
No known issues
Optimize this skill with Tessl
npx tessl skill review --optimize ./cursor-team-kit/skills/fix-merge-conflicts/SKILL.mdQuality
Discovery
50%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 clearly articulates specific capabilities around merge conflict resolution with build validation, establishing a distinct niche. However, it critically lacks any 'Use when...' guidance, which would help Claude know when to select this skill from a large pool. Adding trigger terms and explicit usage conditions would significantly improve its effectiveness.
Suggestions
Add a 'Use when...' clause such as 'Use when the user encounters merge conflicts, needs to resolve git conflicts, or mentions conflict markers like <<<<<<.'
Include additional natural trigger terms users might say, such as 'git merge', 'rebase conflict', 'conflict markers', 'merge failed', or 'conflicting changes'.
| Dimension | Reasoning | Score |
|---|---|---|
Specificity | Lists multiple specific concrete actions: 'resolve merge conflicts non-interactively', 'validate build and tests', and 'finalize conflict resolution'. These are clear, actionable capabilities. | 3 / 3 |
Completeness | Describes what the skill does but completely lacks a 'Use when...' clause or any explicit trigger guidance for when Claude should select this skill. Per rubric guidelines, a missing 'Use when...' clause caps completeness at 2, and since the 'when' is entirely absent, this scores a 1. | 1 / 3 |
Trigger Term Quality | Includes relevant terms like 'merge conflicts', 'build', and 'tests', but misses common user variations such as 'git merge', 'conflict markers', 'rebase conflicts', '<<<<<<', or 'resolve conflicts in files'. | 2 / 3 |
Distinctiveness Conflict Risk | The combination of 'merge conflicts', 'non-interactively', and 'validate build and tests' creates a clear, distinct niche that is unlikely to conflict with other skills like general git operations or testing skills. | 3 / 3 |
Total | 9 / 12 Passed |
Implementation
72%Reviews the quality of instructions and guidance provided to agents. Good implementation is clear, handles edge cases, and produces reliable results.
A concise, well-structured skill that provides a clear mental model for merge conflict resolution. Its main weakness is the lack of concrete, executable commands (git status --porcelain, grep -rn '<<<<<<<', specific test/build commands) and the absence of an explicit retry loop when build/tests fail after resolution.
Suggestions
Add concrete git commands for conflict detection (e.g., `git diff --name-only --diff-filter=U`, `grep -rn '<<<<<<<' .`) and resolution staging (`git add <file>`).
Add an explicit feedback loop: if build/tests fail after resolution, diagnose which resolution caused the failure, revise, and re-validate before staging.
| Dimension | Reasoning | Score |
|---|---|---|
Conciseness | Every line earns its place. No unnecessary explanations of what merge conflicts are or how git works. The skill assumes Claude's competence and provides only the decision-making framework. | 3 / 3 |
Actionability | The workflow provides clear steps but lacks concrete commands (e.g., specific git commands to detect conflicts, exact package manager commands for lockfile regeneration). Guidance is directional rather than executable. | 2 / 3 |
Workflow Clarity | Steps are sequenced logically and include a build/test validation step, but there's no explicit feedback loop for what to do if the build or tests fail after resolution. For a potentially destructive operation like conflict resolution, an explicit error-recovery path is needed. | 2 / 3 |
Progressive Disclosure | This is a simple, single-purpose skill under 50 lines with no need for external references. The content is well-organized into clear sections (Trigger, Workflow, Guardrails, Output) that are easy to scan. | 3 / 3 |
Total | 10 / 12 Passed |
Validation
100%Checks the skill against the spec for correct structure and formatting. All validation checks must pass before discovery and implementation can be scored.
Validation — 11 / 11 Passed
Validation for skill structure
No warnings or errors.
b8f2564
Table of Contents
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.