CtrlK
BlogDocsLog inGet started
Tessl Logo
SkillPublic

fix-merge-conflicts

Resolve merge conflicts non-interactively, validate build and tests, and finalize conflict resolution

Quality

73%

Does it follow best practices?

Run evals on this skill

Adds up to 20 points to the overall score

View guide
SecuritybySnyk

Passed

No findings from the security scan

Fix and improve this skill with Tessl

tessl review fix ./cursor-team-kit/skills/fix-merge-conflicts/SKILL.md
SKILL.md
Quality
Evals
Security

Quality

Content

78%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.

A tight, well-structured, token-efficient skill body that stays entirely on skill-specific guidance and closes with a sensible output contract. Its main weakness is actionability: the workflow names tools but never provides executable commands or a concrete example, and there is no explicit loop for handling build/test failures.

Suggestions

Add concrete commands for the key steps, e.g. `git diff --name-only --diff-filter=U` to list conflicted files and the specific lockfile regeneration command per package manager.

Add a feedback loop after validation, e.g. 'If compile or tests fail, revisit the affected resolutions and re-run before staging', to close the workflow_clarity gap.

DimensionReasoningScore

Conciseness

Lean and efficient with no re-explanation of concepts Claude already knows; every line is skill-specific guidance (e.g. 'Regenerate lockfiles with package manager tools instead of hand-editing'), matching the 'every token earns its place' anchor.

5 / 5

Actionability

Steps name tools and directions ('git status and conflict markers', 'package manager tools', 'Run compile, lint, and relevant tests') but contain no executable commands or examples — no command to list conflicting files, regenerate a lockfile, or run the build. This fits 'some concrete guidance but incomplete; missing key details' rather than 4, which requires concrete code or commands with only minor gaps.

3 / 5

Workflow Clarity

A clear 6-step sequence with an explicit validation checkpoint ('Run compile, lint, and relevant tests') before staging, satisfying the validation requirement for batch-style resolution. It is not 5 because there is no failure-handling loop (what to do when the build or tests fail) after the validation step.

4 / 5

Progressive Disclosure

The body is under 50 lines, well-organized into Trigger/Workflow/Guardrails/Output sections, and needs no external references; no bundle files exist, so per the rubric guidelines a short single-file skill with well-organized sections scores 5.

5 / 5

Total

17

/

20

Passed

Description

53%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 states a clear, concrete capability in third person without fluff, but it lacks any 'when to use' trigger guidance and misses common trigger synonyms (git conflicts, conflict markers, rebase). It is functional but below the quality of the reference good examples, which all pair a what-clause with an explicit when-clause.

Suggestions

Append an explicit trigger clause, e.g. 'Use when a branch has unresolved merge or rebase conflicts, or when the user mentions conflict markers or a failing merge.'

Include natural trigger variations and file markers (git conflicts, merge/rebase conflicts, <<<<<<< markers) so the description matches how users actually phrase the request.

Replace the vague 'finalize conflict resolution' with a concrete final action (e.g. 'stage resolved files and report resolution decisions') to raise specificity.

DimensionReasoningScore

Specificity

Names the domain ('merge conflicts') with two concrete actions ('Resolve merge conflicts non-interactively, validate build and tests'), but 'finalize conflict resolution' is vague and coverage is narrow, matching the 'domain and 1-2 concrete actions, not comprehensive' anchor rather than the 'several specific actions, minor gaps' anchor above it.

3 / 5

Completeness

The 'what' is clear (resolve conflicts, validate build/tests), but there is no 'Use when...' clause or equivalent explicit trigger guidance, which caps completeness at 3 per the judging guidelines. Not score 2 because the 'what' is concrete, not vague.

3 / 5

Trigger Term Quality

'merge conflicts', 'build', and 'tests' are natural terms users would say, but common variations are missing (git conflicts, conflict markers, rebase, failing merge). This fits 'some relevant keywords but missing common variations or synonyms'.

3 / 5

Distinctiveness Conflict Risk

Merge-conflict resolution is a distinct niche with low overlap risk against unrelated skills, but 'finalize conflict resolution' is redundant and it could mildly overlap with general git workflows or commit-message skills, so it sits between 'mostly distinct' (4) and 'clear niche, minimal conflict' (5).

4 / 5

Total

13

/

20

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

Validation for skill structure

No warnings or errors.

Repository

cursor/plugins

Path

cursor-team-kit/skills/fix-merge-conflicts/SKILL.md

Reviewed

Table of Contents

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.