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

86%

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

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

The content is highly actionable with a clear validated workflow and well-organized one-level-deep references to real bundle files. The main weakness is conciseness: a few sections (the inline plan template, the commit-message block, the closing recap) restate content already present elsewhere and could be trimmed.

Suggestions

Trim or relocate the full 'Merge Resolution Plan' markdown template into references/sample-plan.md, keeping only the field list inline since a complete example already lives there.

Shorten the commit message block to a one-line template plus a pointer to the plan, rather than reproducing the full multi-line message body.

Remove the closing 'Remember' list, which restates the Core Principles and inline guidance already stated earlier in the document.

Dimension	Reasoning	Score
Conciseness	The body is mostly efficient operational content, but the full plan markdown template, the full multi-line commit message block, and the closing 'Remember' section restate principles already covered earlier, adding padding that could be tightened.	3 / 5
Actionability	It provides copy-paste-ready bash commands, concrete script invocations (handle-deleted-modified.sh, validate-conflicts.sh), per-language regeneration commands, and worked conflict-resolution examples covering the common cases.	5 / 5
Workflow Clarity	The 7-step workflow is clearly sequenced with explicit validation checkpoints (validate-conflicts.sh, compile/test) and feedback loops (if tests fail: review, fix, re-run), appropriate for destructive batch operations like conflict resolution.	5 / 5
Progressive Disclosure	SKILL.md serves as a well-signaled overview with one-level-deep references (references/patterns.md, references/sample-plan.md) and scripts/ files, all of which exist; bulk detail is appropriately split into referenced files with clear navigation pointers.	5 / 5
	Total	18 / 20 Passed

Description

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

The description is strong: it pairs an explicit trigger clause with a concrete, differentiated list of supported conflict types, using appropriate third-person voice. Minor keyword synonym coverage is the only gap keeping it from being flawless.

Dimension	Reasoning	Score
Specificity	The description lists several concrete capabilities ('merging imports, tests, lock files (regeneration), configuration files, and handling deleted-but-modified files with backup and analysis') but each category is named at a high level rather than fully enumerated, leaving minor gaps in coverage.	4 / 5
Completeness	It explicitly answers both what ('structured framework for merging imports, tests, lock files...') and when ('Use this skill immediately when the user mentions merge conflicts that need to be resolved') with a concrete trigger phrase.	5 / 5
Trigger Term Quality	It includes natural terms a user would say ('merge conflicts', 'imports', 'tests', 'lock files', 'configuration files'), but lacks common synonyms or file extensions like 'git rebase', 'merge markers', or specific lock-file names.	4 / 5
Distinctiveness Conflict Risk	It carves a clear niche (git merge conflict resolution with specific file categories) and uses distinct triggers ('when the user mentions merge conflicts'), minimizing overlap with other skills.	5 / 5
	Total	18 / 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: tailcallhq/forgecode
Path: .forge/skills/resolve-conflicts/SKILL.md
Commit: 6ed5d37

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