CtrlK
BlogDocsLog inGet started
Tessl Logo

fix-merge-conflicts

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

60

Quality

Does it follow best practices?

Impact

No eval scenarios have been run

SecuritybySnyk

Passed

No known issues

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 concise, well-structured, and easy to navigate, but its workflow lacks executable commands and an explicit validate-then-fix feedback loop, which limits actionability and workflow clarity.

Suggestions

Add concrete executable commands for key steps (e.g., `git status`/`git diff --check` to find conflicts, the actual lockfile regeneration command, the specific build/test command) to reach copy-paste-ready guidance.

Insert an explicit feedback loop after validation, e.g., "If compile/lint/tests fail, re-examine the resolved regions and re-run until green before staging."

DimensionReasoningScore

Conciseness

Lean and efficient with no padding or explanations of concepts Claude already knows; every section earns its place and the whole body is under 50 lines.

3 / 3

Actionability

Guidance is specific ("Detect all conflicting files from git status", "Regenerate lockfiles with package manager tools", "Run compile, lint, and relevant tests") but lacks copy-paste-ready executable commands, so it is actionable yet incomplete.

2 / 3

Workflow Clarity

The six steps are clearly sequenced and include a validation step (run compile, lint, tests), but there is no explicit error-recovery feedback loop for when validation fails, leaving checkpoints implicit.

2 / 3

Progressive Disclosure

A simple under-50-line skill with no need for external references, organized into well-labeled sections (Trigger, Workflow, Guardrails, Output), which per the scoring notes warrants a 3.

3 / 3

Total

10

/

12

Passed

Description

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 concise and names concrete actions in a distinct niche, but it lacks an explicit trigger/"Use when" clause and covers only a subset of natural user phrasings for merge conflicts.

Suggestions

Add an explicit "Use when..." clause (e.g., "Use when a branch has unresolved merge or rebase conflicts and must reach a buildable state") to satisfy completeness.

Broaden trigger terms to include common user phrasings such as "git conflicts", "conflict markers", and "rebase conflicts".

DimensionReasoningScore

Specificity

Lists multiple concrete actions ("Resolve merge conflicts non-interactively", "validate build and tests", "finalize conflict resolution"), matching the multi-action anchor rather than the single-domain anchor at 2.

3 / 3

Completeness

It clearly answers what the skill does but has no explicit "Use when..." trigger clause, so per the judging guidelines completeness is capped at 2.

2 / 3

Trigger Term Quality

"merge conflicts", "build and tests", and "conflict resolution" are relevant but miss common user phrasings like "git conflict", "rebase conflicts", or "conflict markers"; coverage is partial.

2 / 3

Distinctiveness Conflict Risk

"merge conflicts" is a clear niche with distinct triggers unlikely to overlap with other skills, matching the clear-niche anchor.

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.

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.