CtrlK
BlogDocsLog inGet started
Tessl Logo

resolving-merge-conflicts

适用于需要解决正在进行的 git merge/rebase 冲突时。

57

Quality

65%

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

Fix and improve this skill with Tessl

tessl review fix ./skills/engineering/resolving-merge-conflicts/SKILL.md
SKILL.md
Quality
Evals
Security

Quality

Content

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

The body is a concise, well-sequenced 5-step workflow that preserves intent and includes a validation step, scoring highly on conciseness and progressive disclosure. The main gap is actionability: concrete git commands would make steps copy-paste executable.

Suggestions

Add concrete commands to key steps, e.g. `git status` / `git diff` for inspecting conflicts and `git rebase --continue` or `git commit` for completion.

Specify how to locate automated checks concretely (e.g. 'look for package.json scripts, Makefile targets, or CI config') rather than leaving it implicit.

Optionally name the specific validation feedback loop ('run checks -> if failures, fix -> re-run until green') to strengthen the checkpoint at step 4.

DimensionReasoningScore

Conciseness

The body is a lean 5-step list with no padding or explanation of concepts Claude already knows; every line earns its place, matching 'Lean and efficient; assumes Claude's competence'.

5 / 5

Actionability

Steps give concrete direction (find primary sources, preserve both sides' intent, run typecheck/tests/format, stage and commit) but lack specific executable git commands like `git status` or `git rebase --continue`, fitting 'Mostly executable guidance; concrete code or commands with minor gaps'.

4 / 5

Workflow Clarity

A clearly sequenced 5-step process with a validation checkpoint (step 4 runs automated checks and fixes issues) and an explicit no-abort rule, matching 'Clear sequence with most checkpoints present; minor validation gaps'.

4 / 5

Progressive Disclosure

A single under-50-line file with no external references needed, organized as a well-structured numbered list; the simple-skill exception applies, matching the score-5 anchor for compact well-organized skills.

5 / 5

Total

18

/

20

Passed

Description

43%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 clearly scopes the skill to merge/rebase conflict resolution with low conflict risk, but it only states the 'when' and omits concrete 'what' actions, leaving it under-specified. Adding explicit capabilities would lift completeness and specificity.

Suggestions

Add concrete actions the skill performs, e.g. 'Inspects conflicted hunks, preserves both sides' intent, and commits the resolved merge' to answer 'what does this do'.

Include natural trigger variations users say, such as 'merge conflict', 'rebase conflict', or 'conflict markers', to broaden trigger-term coverage.

Use a 'Use when...' clause paired with the action list to explicitly answer both what and when.

DimensionReasoningScore

Specificity

The description only names the domain ("解决正在进行的 git merge/rebase 冲突") without listing any concrete resolution actions, matching the anchor 'Names the domain but actions are minimal or generic'.

2 / 5

Completeness

It provides only a weak 'when' clause ("适用于需要解决...冲突时") and no 'what' statement of concrete actions, matching the anchor 'only "when" is present without "what"'.

2 / 5

Trigger Term Quality

It includes relevant natural keywords ("git merge/rebase", "冲突") a user would say, but misses common synonyms/variations like 'conflict resolution' or 'merge markers', fitting 'Some relevant keywords but missing common variations or synonyms'.

3 / 5

Distinctiveness Conflict Risk

It targets a clear, specific niche (in-progress merge/rebase conflict resolution) with distinct triggers and minimal overlap risk with other skills, matching 'Clear niche with distinct triggers; minimal conflict risk'.

5 / 5

Total

12

/

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.

Validation16 / 16 Passed

Validation for skill structure

No warnings or errors.

Repository
vinvcn/mattpocock-skills-zh-CN
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.