resolve-conflicts

Use this skill immediately when the user mentions merge conflicts that need to be resolved. Do not attempt to resolve conflicts directly - invoke this skill first. This skill specializes in providing a structured framework for merging imports, tests, lock files (regeneration), configuration files, and handling deleted-but-modified files with backup and analysis.

Quality

92%

Does it follow best practices?

Run evals on this skill

Adds up to 20 points to the overall score

View guide

Securityby

High

Do not use without reviewing

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.

The body is a well-structured, highly actionable conflict-resolution workflow with explicit validation feedback loops and clean progressive disclosure to real, one-level-deep reference files. Its main weakness is conciseness: the per-type resolution strategies are repeated three times and the sample dialogue is verbose.

Suggestions

Collapse the triple-repeated resolution strategies: keep the detailed 'Resolution Patterns' sections and retain either the 'Common Patterns Reference' quick lookup OR the 'Quick Reference Card' table, not both.

Tighten the 'When Resolution is Unclear' mock dialogue — the four-option sample block can be shortened to a brief example without reproducing a full conflict hunk and four labeled options.

Normalize the script paths (e.g. '.forge/skills/resolve-conflicts/scripts/...') to the relative 'scripts/' location so navigation matches the actual bundle layout.

Dimension	Reasoning	Score
Conciseness	The content is mostly efficient and domain-specific rather than explaining concepts Claude already knows, but the resolution strategies are restated three times (detailed 'Resolution Patterns' sections, the 'Common Patterns Reference' quick lookup, and the 'Quick Reference Card' table) and the mock dialogue under 'When Resolution is Unclear' is long, matching the score-2 'mostly efficient but could be tightened' anchor rather than the score-3 'every token earns its place' level.	2 / 3
Actionability	It provides copy-paste-ready commands (git status, git checkout --ours, cargo update, npm install, protoc) and concrete script invocations (handle-deleted-modified.sh, validate-conflicts.sh) plus a full plan template and commit-message template, matching the score-3 'fully executable code/commands' anchor rather than the score-2 pseudocode level.	3 / 3
Workflow Clarity	A clear 7-step sequence (Assess, Plan+approve, Deleted-Modified, Execute, Validate, Compile/Test, Finalize) includes explicit validation checkpoints — validate-conflicts.sh in Step 5 and a test rerun feedback loop in Step 6 — matching the score-3 anchor with feedback loops for these batch/destructive operations rather than the score-2 level with implicit checkpoints.	3 / 3
Progressive Disclosure	The body is an overview that clearly signals one-level-deep references to real files ('Read references/patterns.md section...', 'see references/sample-plan.md') and separate scripts, with verified files that do not nest further references, matching the score-3 'clear overview with well-signaled one-level-deep references' anchor rather than the score-2 level with inline content that should be split.	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.

The description is strong across all dimensions: it names concrete capabilities, uses the natural trigger term 'merge conflicts', explicitly covers both what and when, and occupies a distinct niche. The capability description is in third person ('This skill specializes in...') and the trigger clause mirrors the endorsed 'Use when...' pattern.

Dimension	Reasoning	Score
Specificity	Lists multiple concrete actions across distinct domains — 'merging imports, tests, lock files (regeneration), configuration files, and handling deleted-but-modified files with backup and analysis' — matching the score-3 anchor for several specific concrete actions rather than the score-2 'some actions' level.	3 / 3
Completeness	It explicitly answers both what ('structured framework for merging...') and when ('Use this skill immediately when the user mentions merge conflicts that need to be resolved'), with an explicit trigger clause, matching the score-3 anchor rather than the score-2 level where 'when' is only implied.	3 / 3
Trigger Term Quality	The phrase 'when the user mentions merge conflicts that need to be resolved' uses exactly the natural term a user would say ('merge conflicts'), with good supporting coverage of 'lock files', 'configuration files', 'imports', and 'tests', matching the score-3 anchor for good natural-term coverage.	3 / 3
Distinctiveness Conflict Risk	'Merge conflicts' is a clear, narrow niche and the specialization in deleted-modified files, lock-file regeneration, and config merging makes it unlikely to trigger for the wrong skill, matching the score-3 '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: tailcallhq/forgecode
Path: .forge/skills/resolve-conflicts/SKILL.md
Commit: 1ca089a

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