CtrlK
BlogDocsLog inGet started
Tessl Logo

fix-merge-conflicts

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

58

Quality

66%

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

72%

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

The body is admirably concise and well-structured for a simple skill, but its workflow guidance stops short of executable commands and lacks an explicit error-recovery loop after validation. Adding concrete commands and a retry-on-failure step would raise the mid-level dimensions.

Suggestions

Add concrete commands to the workflow steps (e.g. `git status`/`git diff --check` to detect conflicts, the package manager's install command for lockfile regeneration).

Insert an explicit feedback loop after step 5: if compile/lint/tests fail, revisit the affected resolution and re-run until green.

Optionally show one short conflict-marker resolution example to make the "minimal, correctness-first edits" guidance copy-paste concrete.

DimensionReasoningScore

Conciseness

The body is lean and assumes Claude's competence — each line (Detect, Resolve, Regenerate lockfiles, Run compile/lint/tests, Stage) earns its place with no padding or explanation of concepts Claude already knows.

3 / 3

Actionability

Guidance is directionally concrete ("from git status and conflict markers", "with package manager tools instead of hand-editing") but provides no specific executable commands or copy-paste examples, leaving it at the partial-guidance level.

2 / 3

Workflow Clarity

Steps are clearly numbered and include a validation step (run compile, lint, tests), but there is no explicit feedback loop (what to do when tests fail) for a destructive operation, which caps workflow clarity at 2.

2 / 3

Progressive Disclosure

This is a simple skill under 50 lines with no need for external references, and its content is well-organized into clearly labeled sections (Trigger, Workflow, Guardrails, Output), satisfying the simple-skill exception for a top score.

3 / 3

Total

10

/

12

Passed

Description

60%

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 specific and action-oriented but lacks an explicit "when to use" trigger clause, leaving completeness and trigger coverage at the mid level. Adding a "Use when…" clause with natural user phrasings would lift the weaker dimensions.

Suggestions

Append a trigger clause such as "Use when a branch has unresolved merge conflicts, or when the user asks to fix git/rebase conflicts."

Add natural term variations (e.g. "git conflict", "conflict markers", "rebase conflict") so trigger coverage matches how users actually phrase the request.

Keep the concrete action list but pair it with the trigger guidance so both "what" and "when" are explicit.

DimensionReasoningScore

Specificity

Lists multiple concrete actions — "Resolve merge conflicts non-interactively", "validate build and tests", and "finalize conflict resolution" — matching the anchor for several specific concrete actions.

3 / 3

Completeness

It clearly states what the skill does but omits any "Use when…" clause or equivalent explicit trigger guidance, which per the judging guidelines caps completeness at 2.

2 / 3

Trigger Term Quality

The only natural trigger term is "merge conflicts"; common variations a user might say (git conflict, conflict markers, rebase conflict) are absent, so coverage is partial rather than comprehensive.

2 / 3

Distinctiveness Conflict Risk

"Resolve merge conflicts non-interactively" names a recognizable niche, but without explicit triggers it could still overlap with general git or development skills rather than being unambiguously distinct.

2 / 3

Total

9

/

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.

Validation16 / 16 Passed

Validation for skill structure

No warnings or errors.

Repository
cursor/plugins
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.