CtrlK
BlogDocsLog inGet started
Tessl Logo

resolving-rollback-conflicts

Replay a list of git-revert commits against the current base branch and resolve the conflicts, when the chat-service's automatic rollback hit a merge conflict it couldn't resolve. Load this when your developer dispatch asks you to resolve a rollback conflict (it carries BASE_BRANCH, FAILED_COMMIT, COMMITS_TO_REVERT). This is NOT a feature ticket — the workflow below replaces the normal ticket rules.

70

Quality

85%

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

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 high-quality, executable runbook for a fragile destructive operation: clear sequencing, explicit validation and feedback loops, and a strong guardrail checklist. Its only real weaknesses are minor conciseness padding and the absence of any progressive-disclosure split, which is largely justified here by the self-contained workflow.

DimensionReasoningScore

Conciseness

The body is dense procedural guidance that mostly earns its tokens, but includes minor over-explanation Claude does not need (the worked conflict-marker block at lines 105-112) and repeats the STATE RB-MERGE reminder nearly verbatim at lines 34 and 158.

4 / 5

Actionability

Commands are fully executable and copy-paste ready given the dispatch payload (e.g. "cd <WORKTREE_PATH> && git revert --no-edit -m 1 <sha>", "git show --stat <sha>"), and the Outcome A/B1/B2/C branching covers the common cases concretely.

5 / 5

Workflow Clarity

A clear Step 0-4 sequence with explicit validation checkpoints (re-check "git diff --name-only HEAD^ HEAD" after every revert), feedback loops (revert your last edit on over-removal; re-apply Outcome B logic after a revert --continue), and a NEVER checklist for a destructive/batch operation.

5 / 5

Progressive Disclosure

The body is well-organized with clear ##/### headers (Spawn prompt, Output contract, Workflow, NEVER) and is appropriately self-contained with no external references needed, though it is a single monolithic file rather than an overview pointing one level deep into bundled references.

4 / 5

Total

18

/

20

Passed

Description

82%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 tight, well-targeted description that concretely states what it does, when to load it, and the dispatch payload it expects, with strong disambiguation against the normal ticket workflow. The only soft spot is specificity, which lists the two core actions but does not enumerate the fuller revert/resolve sub-procedure.

DimensionReasoningScore

Specificity

It names the domain and two concrete actions — "Replay a list of git-revert commits against the current base branch" and "resolve the conflicts" — but does not enumerate a comprehensive set of actions, matching the 1-2-actions anchor rather than the several-actions anchor at 4.

3 / 5

Completeness

It explicitly answers both what ("Replay a list of git-revert commits ... and resolve the conflicts") and when ("Load this when your developer dispatch asks you to resolve a rollback conflict (it carries BASE_BRANCH, FAILED_COMMIT, COMMITS_TO_REVERT)") with concrete trigger phrases.

5 / 5

Trigger Term Quality

Natural keywords users would say are present ("rollback conflict", "merge conflict", "git-revert", "resolve the conflicts") with an explicit "Load this when your developer dispatch asks you to resolve a rollback conflict" trigger, though it stops short of the comprehensive synonym/extension coverage of a 5.

4 / 5

Distinctiveness Conflict Risk

It carves a clear niche (chat-service automatic rollback merge-conflict resolution) and explicitly disambiguates with "This is NOT a feature ticket — the workflow below replaces the normal ticket rules," minimizing conflict risk.

5 / 5

Total

17

/

20

Passed

Validation

100%

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
marmelab/atomic-crm
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.