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.

Quality

84%

Does it follow best practices?

Run evals on this skill

Adds up to 20 points to the overall score

View guide

Securityby

Passed

No findings from the security scan

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.

A tight, well-structured skill body with concrete git commands, a clear decision framework, explicit safety constraints, and useful output templates. The main improvement opportunity is adding explicit post-resolution verification (no leftover conflict markers, successful build/tests) and exact commands for base-branch detection.

Dimension	Reasoning	Score
Conciseness	The body is lean throughout: it never explains git or merge basics, and every section (role, workflow, decision framework, output templates, constraints, final report) carries actionable weight, matching the "every token earns its place" anchor.	5 / 5
Actionability	Concrete commands (`git fetch origin`, `git merge <base-branch>`, `git merge --abort`) and copy-paste-ready output templates cover most cases, but base-branch identification is described only as hints ("Check for a tracking branch or merge base") without the specific commands, leaving minor gaps versus anchor 5.	4 / 5
Workflow Clarity	A clearly ordered 5-step sequence with real checkpoints (document the Step 2 analysis, report pulled commits, stop on clean merge, escalate ambiguous conflicts, prompt user review before committing). It falls short of anchor 5 because there is no verification step confirming all conflict markers are removed or that the merged result builds/tests cleanly; the destructive-operation cap does not apply since the skill explicitly preserves abort paths and gates commits on user review.	4 / 5
Progressive Disclosure	No bundle files exist and none are needed: the entire skill is one well-organized file with clear section headers and inline templates, with nothing that clearly belongs in a separate reference file, matching anchor 5's appropriately-split, easy-navigation standard.	5 / 5
	Total	18 / 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 with an explicit what/when structure and natural trigger phrases. Its only weakness is the what-clause covering just two concrete actions rather than a fuller range of capabilities (e.g., syncing, reporting).

Suggestions

Broaden the what-clause slightly, e.g. "Resolve git merge conflicts by analyzing change intent across branches, then auto-resolving safe conflicts and escalating ambiguous ones", to raise specificity without adding padding.

Consider adding one or two common user synonyms (e.g., "fix merge conflicts" or "conflict markers") to the trigger clause for fuller keyword coverage.

Dimension	Reasoning	Score
Specificity	The description names the domain and two concrete actions ("Resolve git merge conflicts" and "analyzing change intent across branches"), matching the 1-2-concrete-actions anchor; it does not list several specific actions, so it falls short of anchor 4.	3 / 5
Completeness	It explicitly answers both what ("Resolve git merge conflicts by analyzing change intent across branches") and when ("Use when the user asks to resolve merge conflicts, sync a branch, merge branches, or when a git merge produces conflicts") with concrete trigger phrases, matching anchor 5 exactly.	5 / 5
Trigger Term Quality	Natural trigger phrases are well covered ("resolve merge conflicts", "sync a branch", "merge branches", "when a git merge produces conflicts"), but common synonyms such as "fix conflicts", "rebase conflicts", or "merge collision" are missing, fitting anchor 4 rather than 5.	4 / 5
Distinctiveness Conflict Risk	Merge conflict resolution is a clear niche with distinct trigger terms, and the description is unlikely to fire for unrelated git skills, matching anchor 5.	5 / 5
	Total	17 / 20 Passed

Validation

100%

Warnings & errors only

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: mattermost/mattermost-ai-marketplace
Path: plugins/conflicts/skills/conflicts/SKILL.md
Commit: b16652d

Reviewed: 1 day ago

Table of Contents

Discovery Implementation Validation

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.