Resolve merge conflicts non-interactively, validate build and tests, and finalize conflict resolution
76
70%
Does it follow best practices?
Impact
Pending
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
67%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 reasonably strong in specificity and distinctiveness, clearly naming concrete actions around merge conflict resolution. Its main weaknesses are the absence of an explicit 'Use when...' clause and limited coverage of natural trigger terms users might employ (e.g., 'git merge', 'conflict markers', 'rebase').
Suggestions
Add an explicit 'Use when...' clause, e.g., 'Use when the user encounters merge conflicts, asks to resolve git conflicts, or needs help after a failed merge or rebase.'
Include additional natural trigger terms such as 'git merge', 'rebase conflicts', 'conflict markers', '<<<<<<', and '.orig files' to improve keyword coverage.
| 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 | Clearly answers 'what does this do' with three specific actions, but lacks an explicit 'Use when...' clause or equivalent trigger guidance, which caps this dimension at 2 per the rubric guidelines. | 2 / 3 |
Trigger Term Quality | Includes relevant terms like 'merge conflicts', 'build', and 'tests', which users might naturally say. However, it misses common variations like 'git merge', 'conflict markers', 'rebase conflicts', '<<<<<<', or 'merge resolution'. | 2 / 3 |
Distinctiveness Conflict Risk | The description targets a clear niche — non-interactive merge conflict resolution with build/test validation. This is specific enough to be distinguishable from general git skills or generic code review skills. | 3 / 3 |
Total | 10 / 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 well-structured, concise skill that provides a clear framework for merge conflict resolution. Its main weakness is the lack of concrete, executable commands and examples (e.g., specific git commands, example conflict marker resolution patterns). Adding a feedback loop for build/test failures would also strengthen the workflow.
Suggestions
Add concrete git commands for conflict detection (e.g., `git diff --name-only --diff-filter=U`) and example conflict marker resolution patterns showing 'preserve both sides' vs 'choose one side'.
Add an explicit feedback loop after step 5: if build/tests fail, diagnose which resolution caused the failure, fix, and re-run validation before proceeding to step 6.
| 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 Claude needs. | 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 like 'prefer preserving both sides when safe' is helpful but still somewhat abstract without examples of conflict resolution patterns. | 2 / 3 |
Workflow Clarity | Steps are logically sequenced and include a build/test validation step (step 5), but there's no explicit feedback loop for what to do if the build or tests fail after resolution. For a destructive/risky operation like merge conflict resolution, the absence of a retry/fix loop caps this at 2. | 2 / 3 |
Progressive Disclosure | This is a simple, single-purpose skill under 50 lines with well-organized sections (Trigger, Workflow, Guardrails, Output). No external references are needed, and the structure is clean and easy to navigate. | 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.
7dd9fea
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.