pull-changes-resolve-conflicts

Standard workflow for pulling updates from main or other branches on multi-contributor projects (including Flows apps) without silently discarding work. Guides fetching/merging, requires listing merge conflicts explicitly, analyzing ours vs theirs using conversation history and repo context, presenting prioritized recommendations, and obtaining user answers before editing conflict markers or completing the merge. Triggers: pull main, merge main, merge origin, rebase, merge conflict, unmerged paths, both modified, integrate branch, sync with main, git merge abort, resolve conflicts, UU status, theirs vs ours, feat branch update.

1.00x

Quality

90%

Does it follow best practices?

Impact

65%

1.00x

Average score across 1 eval scenario

Securityby

Passed

No findings from the security scan

Quality

Content

81%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 well-structured, actionable merge-conflict workflow with strong sequencing and explicit validation. The main weakness is a broken link to reference.md, which is referenced but absent from the bundle.

Suggestions

Add the missing reference.md file (or remove the link to it) so the 'optional command snippets and a merge message template' pointer resolves.

Tighten the contextual padding in the intro and Goals, e.g. the Flows/React aside, to lift conciseness toward fully lean.

Inline the merge message template or a minimal command snippet inline rather than deferring to a non-existent file.

Dimension	Reasoning	Score
Conciseness	Mostly lean and assumes Claude's git competence, but a few lines pad context (e.g. 'Applies to any Git-based team workflow; Flows/React apps are a common case where conflicts cluster...') that could be trimmed. Not a 5 because of these minor over-explanations; not a 3 because the bulk is efficient and non-padded.	4 / 5
Actionability	Provides concrete, executable commands — 'git fetch', 'git merge origin/main', 'git show :2:path' vs ':3:path', 'git merge --abort' — but defers 'optional command snippets and a merge message template' to a reference file, leaving a minor gap. Not a 5 because of that deferred-and-missing detail; not a 3 because the core guidance is directly executable.	4 / 5
Workflow Clarity	A clearly sequenced 5-step workflow with explicit validation checkpoints ('Re-run git status; ensure no conflict markers remain; run tests or lint') and a stop-at-conflicts gate with an abort branch, satisfying the destructive-operation validation requirement.	5 / 5
Progressive Disclosure	Well-organized into Goals, Hard rules, Workflow, Anti-patterns, and Quick reference with a single clearly signaled one-level-deep pointer to reference.md. Not a 5 because that referenced reference.md file does not actually exist in the bundle, leaving a broken navigation link; not a 3 because the structure itself is genuinely good and content is appropriately placed.	4 / 5
	Total	17 / 20 Passed

Description

100%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: third-person, concrete actions, and a comprehensive explicit trigger list that answers both what and when. No vague fluff or over-claims.

Dimension	Reasoning	Score
Specificity	Lists multiple concrete actions — 'fetching/merging', 'listing merge conflicts explicitly', 'analyzing ours vs theirs', 'presenting prioritized recommendations', 'obtaining user answers before editing conflict markers' — with comprehensive coverage of the workflow.	5 / 5
Completeness	Explicitly answers both 'what' (the full resolution workflow) and 'when' via a dedicated concrete trigger-phrase list, matching the anchor that requires both with concrete trigger phrases.	5 / 5
Trigger Term Quality	The explicit 'Triggers:' list gives comprehensive natural terms and synonyms users would say — 'pull main', 'merge main', 'rebase', 'merge conflict', 'unmerged paths', 'both modified', 'resolve conflicts', 'UU status', 'theirs vs ours'.	5 / 5
Distinctiveness Conflict Risk	Occupies a clear niche — pulling updates and resolving merge conflicts with user-gated resolution — and its triggers ('UU status', 'both modified', 'git merge abort') are specific enough to minimize conflict with other skills.	5 / 5
	Total	20 / 20 Passed

Validation

81%

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 — 13 / 16 Passed

Validation for skill structure

Criteria	Description	Result
allowed_tools_field	'allowed-tools' contains unusual tool name(s)	Warning
metadata_version	'metadata.version' is missing	Warning
relative_links	Relative link issues: 1 missing	Warning

	Total	13 / 16 Passed

Repository: cognitedata/builder-skills
Path: skills/pull-changes-resolve-conflicts/SKILL.md
Commit: c87160a

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