CtrlK
BlogDocsLog inGet started
Tessl Logo
SkillPublic

git-resolve-version-conflicts

Resolve rebase/merge conflicts in CDS release-versioning files — package.json "version" fields and CHANGELOG.md entries — that arise because packages were versioned independently on master and the current branch. Recomputes each package's version by applying the branch's bump type (patch/minor/major) on top of master's latest version, rewrites CHANGELOG entries with today's date and the new version, then continues the rebase and formats. Use when the user asks to "resolve a versioning conflict", "resolve a package.json conflict", "resolve a changelog conflict", or when you organically detect conflict markers in package.json / CHANGELOG.md files during a rebase or merge. When detected organically, ALWAYS ask the user for confirmation before running this flow.

Quality

94%

Does it follow best practices?

Run evals on this skill

Adds up to 20 points to the overall score

View guide
SecuritybySnyk

Passed

No findings from the security scan

The canonical home for this skill is git.resolve-version-conflicts in coinbase/cds

SKILL.md
Quality
Evals
Security

Quality

Content

88%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 strong, disciplined procedural skill: concrete executable commands, a clearly sequenced workflow with explicit validation checkpoints, feedback loops, and safety stops appropriate to a destructive rebase operation. The only weaknesses are mild redundancy between 'The rules' section and the numbered steps, and ~200 lines of detail kept entirely inline where a reference file could offload some of it.

Suggestions

Consolidate the bump-type arithmetic and formatting rules between 'The rules (source of truth)' and the corresponding numbered steps so each fact appears once, trimming token cost without losing clarity.

Move the CHANGELOG heading-format examples and rules-of-thumb from Step 4 into a short reference file (e.g., references/changelog-formats.md) and link to it, keeping SKILL.md as a lean overview.

Consider moving the 'Prefer re-running the release' alternative into the referenced docs/release.md with a one-line pointer, since it is a fallback path rather than the core procedure.

DimensionReasoningScore

Conciseness

The body is efficient and assumes competence — commands are given bare with no library or git tutorials — but 'The rules (source of truth)' section partially duplicates the step detail (e.g., bump-type arithmetic in rule 2 restated in Step 1, formatting rule 5 restated as Step 7), which is minor over-explanation that could be trimmed. It fits anchor 4 ('efficient; minor instances that could be trimmed') rather than 5 ('every token earns its place') and is clearly above anchor 3 since nearly all content is project-specific knowledge Claude would not already know.

4 / 5

Actionability

Guidance is fully executable with copy-paste-ready commands for every step — 'git show <version-commit> -- '**/package.json'', 'git show origin/master:packages/<pkg>/package.json | grep '"version"'', 'GIT_EDITOR=true git rebase --continue', 'yarn nx format:write' — plus a worked example ('master was 9.6.9… resolved version = 9.6.10') and exact CHANGELOG heading formats. Placeholders are explained, so nothing is pseudocode; this matches the top anchor and exceeds anchor 4's 'minor gaps'.

5 / 5

Workflow Clarity

Steps 0–8 are clearly sequenced with explicit validation checkpoints (Step 0 scope partition with a STOP rule, Step 5 'grep … Expect no output') and a feedback loop ('If more conflicts surface on later commits, repeat Steps 0–6; if a later conflict is out-of-scope, stop and raise it'). This is a history-rewriting batch operation and the required validation is present, so it matches the top anchor; it is above anchor 4 because every checkpoint and error-recovery path is explicit, including the merge alternative and the do-not-push safety note.

5 / 5

Progressive Disclosure

The single procedure is well organized into clearly signaled sections with an external pointer ('See docs/release.md') one level deep, and there are no bundle files to split into. It fits anchor 4 ('good structure; most content appropriately placed; minor organization gaps') rather than 5 because at ~200 lines all detail — e.g., the two CHANGELOG heading shapes and rules-of-thumb in Step 4 — lives inline in SKILL.md where a small reference file could carry it; it is above anchor 3 since nothing that clearly belongs elsewhere is inlined and navigation is easy.

4 / 5

Total

18

/

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.

An excellent description: third-person voice, concrete multi-action capability statement, explicit 'Use when' triggers with natural user phrasings, plus a clearly bounded CDS-specific niche that minimizes conflict risk. Every dimension sits at the top anchor.

DimensionReasoningScore

Specificity

The description lists multiple concrete actions — 'Recomputes each package's version by applying the branch's bump type (patch/minor/major) on top of master's latest version', 'rewrites CHANGELOG entries with today's date and the new version, then continues the rebase and formats' — covering the full capability comprehensively. It matches the anchor 'lists multiple specific concrete actions; comprehensive coverage' and is not the level below, which would require minor gaps in coverage.

5 / 5

Completeness

Both 'what' (recompute versions by reapplying the branch's bump on master's latest, rewrite CHANGELOG entries, continue rebase, format) and 'when' (explicit 'Use when the user asks to… or when you organically detect conflict markers… during a rebase or merge') are clearly and explicitly answered with concrete trigger phrases. The explicit organic-detection confirmation requirement adds further 'when' guidance, so the score-4 anchor ('when' could be more explicit) does not fit.

5 / 5

Trigger Term Quality

It includes natural user phrasings ('resolve a versioning conflict', 'resolve a package.json conflict', 'resolve a changelog conflict') plus file names and context keywords (package.json, CHANGELOG.md, rebase, merge, conflict markers), giving comprehensive coverage with synonyms and concrete file identifiers. It is not score 4 because no clearly common natural term is missing.

5 / 5

Distinctiveness Conflict Risk

The trigger is a clear niche — version-field and CHANGELOG conflicts in the CDS release group during rebase/merge — with distinct trigger phrases, so it is unlikely to fire for other skills. It is not score 4 because there is no meaningful overlap with closely related skills; the scope is narrowly and unambiguously defined.

5 / 5

Total

20

/

20

Passed

Validation

87%

Checks the skill against the spec for correct structure and formatting. All validation checks must pass before discovery and implementation can be scored.

Validation — 14 / 16 Passed

Validation for skill structure

CriteriaDescriptionResult

allowed_tools_field

'allowed-tools' contains unusual tool name(s)

Warning

frontmatter_unknown_keys

Unknown frontmatter key(s) found; consider removing or moving to metadata

Warning

Total

14

/

16

Passed

Repository

coinbase/cds

Path

.agents/skills/git-resolve-version-conflicts/SKILL.md

Reviewed

Table of Contents

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.