CtrlK
BlogDocsLog inGet started
Tessl Logo
SkillPublic

frb-fix-merge-conflict

Use when resolving merge or rebase conflicts in flutter_rust_bridge, especially conflicts involving generated files after master/main changed independently from a PR branch.

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, highly actionable skill body: exact commands, a clear sequenced workflow with explicit validation and error-recovery loops, and tight repo-specific guidance. Only minor deductions for a small amount of already-known Git explanation and prose-only (unlinked) references to sibling skills.

DimensionReasoningScore

Conciseness

The body is lean and repo-specific with almost no filler — classification table, exact commands, and project quirks — but includes a few trims: the rebase ours/theirs semantics ('remember Git reverses the intuitive meaning of ours/theirs') restates a Git concept Claude already knows, and the Core Rule slightly duplicates the workflow steps. This fits anchor 4 ('efficient; minor instances of over-explanation that could be trimmed') rather than the every-token-earns-its-place of 5.

4 / 5

Actionability

Fully executable throughout: 'git diff --name-only --diff-filter=U', './frb_internal precommit-generate', 'git checkout --ours -- <generated-path>', per-package codegen commands, and concrete validation commands ('git diff --check', 'git status --short'). It also covers the common failure case ('CI errors mention missing methods on RustLibApi means package frb_generated.* is stale'), matching anchor 5.

5 / 5

Workflow Clarity

Clear numbered sequence (classify → resolve hand-written → placeholder → stage → regenerate → inspect → commit) with an explicit Validation section of runnable checkpoint commands, error-recovery guidance for the stale-package case, and a feedback loop ('If CI later reports more generated diff, add the experience back to this skill'). This matches anchor 5: clear sequence, explicit validation, feedback loops.

5 / 5

Progressive Disclosure

No bundle files exist (no references/, scripts/, or assets/), and the single-file structure with headers, a classification table, and clearly named sibling-skill handoffs ('frb-code-generation', 'frb-fix-ci') is well organized. It falls short of anchor 5 because those handoffs are named in prose rather than linked/pathed references, and no navigation to the env-setup material is provided — 'good structure, references mostly clear, minor organization gaps' (4) is the best fit.

4 / 5

Total

18

/

20

Passed

Description

73%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 well-scoped, distinct trigger description with explicit 'when' guidance and strong natural keywords, but it reads almost entirely as a trigger clause — the 'what' (resolve hand-written files semantically, regenerate generated outputs) is only implied. Adding one sentence of concrete capability would lift it to the top anchors.

Suggestions

State the core capability explicitly, e.g. 'Resolves hand-written conflicts semantically and regenerates generated outputs (frb_generated.*, *.g.dart) instead of hand-merging them. Use when...'

Add trigger synonyms users commonly say, such as 'conflict markers', 'codegen drift', or 'regenerate after merge', to broaden natural keyword coverage.

DimensionReasoningScore

Specificity

The description names the domain ('resolving merge or rebase conflicts in flutter_rust_bridge') and one concrete action area ('conflicts involving generated files'), but does not list the actual capabilities (semantic resolution of hand-written files, regenerating outputs). It sits between anchor 3 ('names domain and 1-2 concrete actions, but not comprehensive') and anchor 4; it lacks the several-specific-actions listing of 4, so 3 is the best fit.

3 / 5

Completeness

The 'when' is fully explicit ('Use when resolving merge or rebase conflicts... after master/main changed independently from a PR branch') and the 'what' is present but minimal — resolving FRB conflicts, especially generated ones — without stating the distinctive capability (regenerate rather than hand-resolve). This matches anchor 4 ('has both what and when; when could be more explicit or specific' — here the what is the weaker half) better than 5, which requires both fully concrete.

4 / 5

Trigger Term Quality

Strong natural terms users would say: 'merge', 'rebase', 'conflicts', 'generated files', 'master/main', 'PR branch', plus the project name. A few common variations are missing (e.g., 'conflict markers', 'codegen', 'regenerate'), so it fits anchor 4 ('good keyword coverage; a few natural terms missing') rather than the comprehensive synonym coverage of 5.

4 / 5

Distinctiveness Conflict Risk

Clear niche with distinct triggers: it is scoped to flutter_rust_bridge conflict resolution with generated files, master/main-vs-PR drift specifics. A generic git merge-conflict skill could overlap on 'merge conflicts', but the FRB and generated-file scoping makes wrong-skill triggering unlikely, matching anchor 5.

5 / 5

Total

16

/

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

fzyzcjy/flutter_rust_bridge

Path

.claude/skills/frb-fix-merge-conflict/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.