CtrlK
BlogDocsLog inGet started
Tessl Logo

conflicts

Resolve git merge conflicts by analyzing change intent across branches. Use when the user asks to resolve merge conflicts, sync a branch, merge branches, or when a git merge produces conflicts.

64

Quality

76%

Does it follow best practices?

Impact

No eval scenarios have been run

SecuritybySnyk

Passed

No known issues

Optimize this skill with Tessl

npx tessl skill review --optimize ./plugins/conflicts/skills/conflicts/SKILL.md
SKILL.md
Quality
Evals
Security

Quality

Content

62%

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

This is a well-structured skill with excellent workflow clarity and a thoughtful decision framework for conflict resolution. Its main weaknesses are moderate verbosity (explaining concepts Claude already knows, like change categorization) and a lack of truly executable, concrete commands beyond basic git operations. The content would benefit from being more concise and providing more specific, actionable examples.

Suggestions

Remove the 'Role' section entirely—it restates the skill description and wastes tokens on framing Claude already receives from the frontmatter.

Add concrete git commands for the analysis step (e.g., `git log --oneline base..HEAD`, `git diff --name-status base..HEAD`) instead of describing what to do abstractly.

Trim the change categorization in Step 2—Claude understands the difference between intentional and incidental changes without explicit definitions and examples of each category.

Consider extracting the detailed output format templates and the decision framework into a referenced file to keep the main SKILL.md leaner.

DimensionReasoningScore

Conciseness

The skill is reasonably well-structured but includes some unnecessary verbosity. The 'Role' section is redundant (Claude doesn't need to be told it's an agent), and some categorizations (e.g., explaining what 'intentional modifications' vs 'incidental changes' are) over-explain concepts Claude already understands. The decision framework criteria could be tighter.

2 / 3

Actionability

The workflow provides a clear sequence of steps with some concrete commands (git fetch, git merge), but most guidance is descriptive rather than executable. There are no complete code/script examples for analyzing commits, and the conflict resolution logic is expressed as prose decision trees rather than concrete, copy-paste-ready commands or scripts.

2 / 3

Workflow Clarity

The multi-step workflow is clearly sequenced (Steps 1-5) with explicit validation checkpoints: analyzing before merging, documenting analysis before proceeding, checking for clean merge before conflict resolution, staging and prompting user review before committing, and the ability to abort. The decision framework for conflicts includes clear escalation paths (auto-resolve vs. user input) and the final report serves as a verification step.

3 / 3

Progressive Disclosure

The content is a single monolithic file with no references to supporting documents. While the sections are well-organized with clear headers, the conflict resolution output formats, decision framework, and constraints could be split into referenced files for better token efficiency. For a skill of this length (~100 lines of substantive content), some progressive disclosure would be beneficial.

2 / 3

Total

9

/

12

Passed

Description

89%

Based on the skill's description, can an agent find and select it at the right time? Clear, specific descriptions lead to better discovery.

This is a solid skill description with an explicit 'Use when...' clause covering multiple natural trigger scenarios and a clear niche around git merge conflicts. The main weakness is that the 'what' portion could be more specific about the concrete actions performed beyond 'analyzing change intent' — listing specific resolution strategies would strengthen it.

Suggestions

Add more specific concrete actions to the capability portion, e.g., 'Resolve git merge conflicts by analyzing change intent across branches, choosing appropriate resolutions, editing conflict markers, and staging resolved files.'

DimensionReasoningScore

Specificity

The description names the domain (git merge conflicts) and one action (resolve/analyzing change intent), but doesn't list multiple concrete actions like 'accept theirs/ours, edit conflict markers, stage resolved files'.

2 / 3

Completeness

Clearly answers both 'what' (resolve git merge conflicts by analyzing change intent across branches) and 'when' (explicit 'Use when...' clause with multiple trigger scenarios).

3 / 3

Trigger Term Quality

Includes strong natural trigger terms: 'resolve merge conflicts', 'sync a branch', 'merge branches', 'git merge produces conflicts' — these cover the common ways users would phrase such requests.

3 / 3

Distinctiveness Conflict Risk

The description is narrowly scoped to git merge conflicts specifically, with distinct triggers like 'merge conflicts', 'sync a branch', and 'merge branches' that are unlikely to overlap with other skills.

3 / 3

Total

11

/

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.

Validation11 / 11 Passed

Validation for skill structure

No warnings or errors.

Repository
mattermost/mattermost-ai-marketplace
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.