CtrlK
BlogDocsLog inGet started
Tessl Logo

resolving-merge-conflicts

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

45

Quality

47%

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 ./skills/engineering/resolving-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 a concise, well-sequenced 5-step workflow that respects Claude's competence and needs no external references. Its main gap is actionability and a fully closed validation loop, since it describes actions rather than giving executable commands.

Suggestions

Add concrete executable commands where natural, e.g. `git status`, `git diff`, `git add -A`, `git commit`, and `git rebase --continue` / `git merge --continue`.

Insert an explicit validation gate before completing: 'Only proceed to commit when typecheck and tests pass; re-run after fixes.'

Optionally mention how to inspect a conflict hunk (`git diff` / conflict markers) to make the resolution step more actionable.

DimensionReasoningScore

Conciseness

The five numbered steps are lean, assume Claude's knowledge of git, and contain no padding or re-explanation of known concepts, matching the 'lean and efficient' anchor.

3 / 3

Actionability

Steps name concrete actions ('阅读 commit messages', 'typecheck、tests、format', 'Stage 所有内容并 commit') but provide no executable commands or copy-paste code, leaving guidance incomplete per anchor 2.

2 / 3

Workflow Clarity

The 5-step sequence is clear and includes a validation checkpoint (run automated checks, fix issues), but the feedback loop is not closed with a 'only proceed when checks pass' gate before completing the merge, fitting anchor 2's validation-gap case.

2 / 3

Progressive Disclosure

With no bundle files and the skill well under 50 lines, the organized numbered steps with bold lead-ins satisfy the simple-skill allowance for a top progressive_disclosure score.

3 / 3

Total

10

/

12

Passed

Description

22%

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 functions as a trigger clause but omits any statement of what the skill does, leaving its capabilities unstated. It is reasonably distinctive and uses natural trigger terms, yet falls short on specificity and completeness.

Suggestions

Add a concrete capability clause, e.g. 'Resolves git merge and rebase conflicts by reconciling both branches' intent, running automated checks, and completing the merge.'

Keep the 'Use when...' trigger but pair it with an explicit 'what' statement so completeness reaches anchor 3.

Include a couple of natural trigger variations (e.g. 'merge conflict', 'rebase conflict', 'conflict markers') to broaden trigger-term coverage.

DimensionReasoningScore

Specificity

The description '适用于需要解决正在进行的 git merge/rebase 冲突时' states only when to use the skill, naming no concrete actions or capabilities, matching the vague 'Helps with documents' anchor.

1 / 3

Completeness

It answers 'when' (适用时) but is missing any 'what does this do' statement of capabilities, which anchor 1 treats as missing what OR when; anchor 2 requires the opposite (has what, when implied).

1 / 3

Trigger Term Quality

It includes natural terms a user would say ('git merge/rebase', '冲突'/conflict) but offers no common variations or fuller keyword coverage, so it sits between the jargon-only 1 and the broad-coverage 3.

2 / 3

Distinctiveness Conflict Risk

'git merge/rebase conflicts' is a distinct niche unlikely to conflict with other skills, but the terse phrasing lacks the action list that distinguishes a clear-3 example.

2 / 3

Total

6

/

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