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

92%

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

85%Weight 40%Scale 1-3

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

A well-structured, actionable process skill with clear sequencing, validation checkpoints, and ready-to-use output templates. Its only weakness is minor prose padding that could be trimmed for token efficiency.

Suggestions

Trim editorial sentences like 'Document this analysis before proceeding—it informs all conflict resolution decisions' to lift conciseness toward the lean anchor.

Tighten the Step 2 change-categorization bullets into more compact phrasing to reduce token overhead without losing the actionable distinction.

Consider supplying the actual git command for the Step 1 base-branch detection methods (e.g., merge-base / tracking refs) instead of leaving them directional, to make every step fully executable.

Dimension	Reasoning	Score
Conciseness	The body is mostly efficient with no concept-overexplaining, but includes editorial padding ('Document this analysis before proceeding—it informs all conflict resolution decisions') and slightly elaborate categorization prose that could be tightened, matching the 'mostly efficient but could be tightened' anchor rather than the lean 3.	2 / 3
Actionability	Provides concrete commands ('git fetch origin', 'git merge <base-branch>', 'git merge --abort'), a specific decision framework with explicit accept/escalate rules, and copy-paste-ready output templates, matching the 'specific examples; copy-paste ready' anchor; the few directional items in Step 1 are appropriately flagged for user confirmation.	3 / 3
Workflow Clarity	Steps 1-5 are explicitly ordered with validation checkpoints (conflict-detection branching in Step 4, abort path preserved in Constraints, user-review gate before commit) and a final summary, satisfying the feedback-loop requirement for destructive merge operations rather than capping at 2.	3 / 3
Progressive Disclosure	A single self-contained SKILL.md with no bundle files and well-organized sections (Role, Workflow, Output Format, Constraints, Final Report); no nested references or monolithic wall of text, so the well-organized-sections allowance for self-contained single-purpose skills applies.	3 / 3
	Total	11 / 12 Passed

Description

100%Weight 40%Scale 1-3

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, concise description that clearly states what the skill does and when to use it, with natural trigger terms and a distinct niche. It hits every dimension's top anchor without padding.

Dimension	Reasoning	Score
Specificity	Names multiple concrete actions — 'Resolve git merge conflicts', 'analyzing change intent across branches', 'sync a branch, merge branches' — matching the 'lists multiple specific concrete actions' anchor rather than the partial-domain anchor at 2.	3 / 3
Completeness	Explicitly answers both 'what' ('Resolve git merge conflicts by analyzing change intent across branches') and 'when' (a 'Use when...' clause enumerating triggers), matching the both-what-and-when anchor and exceeding the 2 cap that applies when trigger guidance is missing.	3 / 3
Trigger Term Quality	Includes natural phrases users would say — 'resolve merge conflicts', 'sync a branch', 'merge branches', 'git merge produces conflicts' — giving good coverage of common variations, above the 'some relevant keywords' anchor.	3 / 3
Distinctiveness Conflict Risk	Occupies a clear niche (git merge conflict resolution) with specific triggers unlikely to fire for unrelated skills, matching the 'clear niche with distinct triggers' anchor.	3 / 3
	Total	12 / 12 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: 90ab32d

Reviewed: 15 days 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.