CtrlK
BlogDocsLog inGet started
Tessl Logo
SkillPublic

resolving-merge-conflicts

Resolve an in-progress git merge or rebase conflict. Trigger: merge conflict, rebase conflict.

67

Quality

84%

Does it follow best practices?

Run evals on this skill

Adds up to 20 points to the overall score

View guide
SecuritybySnyk

Low

Low-risk findings worth noting

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.

An efficient, well-sequenced instruction-only skill whose guidance is directionally concrete but omits the specific commands that would make it fully executable. The validation step exists but its retry loop is implicit rather than explicit.

Suggestions

Add the specific git commands for each step, e.g. `git status` / `git log --merge -p` to inspect state, `git diff` to review hunks, and `git add` + `git rebase --continue` (or `git commit`) to finish.

Close the validation loop in step 4 explicitly: re-run the checks after fixing until they pass before moving to step 5.

Name how to locate the original PRs/issues (e.g., commit message trailers, `git log <branch>` blame) so step 2 is executable rather than aspirational.

DimensionReasoningScore

Conciseness

Five lean numbered steps with no padding and no explanation of git concepts Claude already knows; every token earns its place.

5 / 5

Actionability

Directions are concrete ("Read the commit messages, check the PRs", "typecheck, then tests, then format", "Stage everything and commit") but no executable commands are given (e.g., git status, git log --merge, git rebase --continue), leaving key details unstated.

3 / 5

Workflow Clarity

A clear five-step sequence with an explicit validation checkpoint (step 4: run automated checks and fix breakage), but the feedback loop is not fully closed — it never says to re-run checks after fixing or verify a clean end state.

4 / 5

Progressive Disclosure

Under 50 lines, single-purpose, with no need for external references; the well-organized numbered steps satisfy the simple-skill case for the top anchor.

5 / 5

Total

17

/

20

Passed

Description

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

A strong description: concise, third-person, with an explicit trigger clause covering both merge and rebase scenarios. Its only weakness is thin capability coverage — a single "resolve" action where a fuller enumeration (e.g., inspecting conflicts, resolving hunks, running checks, completing the merge) would improve specificity.

DimensionReasoningScore

Specificity

"Resolve an in-progress git merge or rebase conflict" names a precise domain and one concrete action, but only one capability is listed rather than several, matching the 'names domain and 1-2 concrete actions, but not comprehensive' anchor.

3 / 5

Completeness

It explicitly answers both what ("Resolve an in-progress git merge or rebase conflict") and when ("Trigger: merge conflict, rebase conflict") with concrete trigger phrases, matching the top anchor.

5 / 5

Trigger Term Quality

"Trigger: merge conflict, rebase conflict" supplies the two exact phrases users naturally say, covering both primary scenarios, though common variations like "fix conflict", "resolve conflict", or "conflict markers" are missing.

4 / 5

Distinctiveness Conflict Risk

Git merge/rebase conflict resolution is a clear niche with distinct, unambiguous triggers; minimal overlap risk with other skills.

5 / 5

Total

17

/

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

YoizenSA/dev-ai-workflow

Path

ywai/skills/resolving-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.