Core API Change
libnativeapi/nativeapi
Carry a change to the C++ public API in core/ all the way downstream — design check, header edit, six platform implementations, C ABI + Rust/Dart/C/JS/Python regeneration, per-binding verification…
A skill your agent uses when resolving merge or rebase conflicts in flutterrustbridge, especially conflicts involving generated files after master/main changed independently from a PR branch.
Install Frb Fix Merge Conflict
$ npx skills add fzyzcjy/flutter_rust_bridge --skill frb-fix-merge-conflict -a claude-codeProject install by default; add -g for ~/.claude/skills/.
$ gh skill install fzyzcjy/flutter_rust_bridge frb-fix-merge-conflict --agent claude-codeProject scope by default; add --scope user for a personal install. Needs GitHub CLI 2.90.0 or later (public preview).
$ git clone --depth 1 https://github.com/fzyzcjy/flutter_rust_bridge.git skills-src && mkdir -p .claude/skills && cp -r skills-src/.claude/skills/frb-fix-merge-conflict .claude/skills/frb-fix-merge-conflict && rm -rf skills-srcUse ~/.claude/skills/ instead of .claude/skills for a personal install. The folder must contain SKILL.md.
Claude Code skills documentation · loads skills from .claude/skills/
Install the "frb-fix-merge-conflict" agent skill from https://github.com/fzyzcjy/flutter_rust_bridge/tree/master/.claude/skills/frb-fix-merge-conflict into .claude/skills/frb-fix-merge-conflict/ in this project. Copy the whole folder (SKILL.md and every file beside it), keep the folder name "frb-fix-merge-conflict", then confirm the skill loads.Claude Code copies the folder itself, the same result as the manual copy. Check what it changed before you commit it.
$skill-installer install https://github.com/fzyzcjy/flutter_rust_bridge/tree/master/.claude/skills/frb-fix-merge-conflictType this inside Codex. $skill-installer <name> installs a curated skill from openai/skills. The installer writes to $CODEX_HOME/skills (default ~/.codex/skills). Restart Codex if the skill does not show up.
$ npx skills add fzyzcjy/flutter_rust_bridge --skill frb-fix-merge-conflict -a codexProject install goes to .agents/skills/; add -g for ~/.codex/skills/.
$ gh skill install fzyzcjy/flutter_rust_bridge frb-fix-merge-conflict --agent codexProject scope by default (.agents/skills/); add --scope user for a personal install.
$ git clone --depth 1 https://github.com/fzyzcjy/flutter_rust_bridge.git skills-src && mkdir -p .agents/skills && cp -r skills-src/.claude/skills/frb-fix-merge-conflict .agents/skills/frb-fix-merge-conflict && rm -rf skills-srcUse ~/.agents/skills/ instead of .agents/skills for a personal install.
Codex skills documentation · loads skills from .agents/skills/
Install the "frb-fix-merge-conflict" agent skill from https://github.com/fzyzcjy/flutter_rust_bridge/tree/master/.claude/skills/frb-fix-merge-conflict into .agents/skills/frb-fix-merge-conflict/ in this project. Copy the whole folder (SKILL.md and every file beside it), keep the folder name "frb-fix-merge-conflict", then confirm the skill loads.Codex copies the folder itself, the same result as the manual copy. Check what it changed before you commit it.
$ npx skills add fzyzcjy/flutter_rust_bridge --skill frb-fix-merge-conflict -a cursorProject install goes to .agents/skills/; add -g for ~/.cursor/skills/.
$ gh skill install fzyzcjy/flutter_rust_bridge frb-fix-merge-conflict --agent cursorProject scope by default (.agents/skills/); add --scope user for a personal install.
$ git clone --depth 1 https://github.com/fzyzcjy/flutter_rust_bridge.git skills-src && mkdir -p .cursor/skills && cp -r skills-src/.claude/skills/frb-fix-merge-conflict .cursor/skills/frb-fix-merge-conflict && rm -rf skills-srcUse ~/.cursor/skills/ instead of .cursor/skills for a personal install.
Cursor skills documentation · loads skills from .cursor/skills/, .agents/skills/, .claude/skills/, .codex/skills/
Install the "frb-fix-merge-conflict" agent skill from https://github.com/fzyzcjy/flutter_rust_bridge/tree/master/.claude/skills/frb-fix-merge-conflict into .cursor/skills/frb-fix-merge-conflict/ in this project. Copy the whole folder (SKILL.md and every file beside it), keep the folder name "frb-fix-merge-conflict", then confirm the skill loads.Cursor copies the folder itself, the same result as the manual copy. Check what it changed before you commit it.
$ gemini skills install https://github.com/fzyzcjy/flutter_rust_bridge.git --path .claude/skills/frb-fix-merge-conflict--scope user (default) or --scope workspace; --path is the subfolder of the repo that holds the skill; --consent skips the security confirmation prompt.
$ npx skills add fzyzcjy/flutter_rust_bridge --skill frb-fix-merge-conflict -a gemini-cliProject install goes to .agents/skills/; add -g for ~/.gemini/skills/.
$ gh skill install fzyzcjy/flutter_rust_bridge frb-fix-merge-conflict --agent gemini-cliProject scope by default (.agents/skills/); add --scope user for a personal install.
$ git clone --depth 1 https://github.com/fzyzcjy/flutter_rust_bridge.git skills-src && mkdir -p .gemini/skills && cp -r skills-src/.claude/skills/frb-fix-merge-conflict .gemini/skills/frb-fix-merge-conflict && rm -rf skills-srcUse ~/.gemini/skills/ instead of .gemini/skills for a personal install, then run /skills reload.
Gemini CLI skills documentation · loads skills from .gemini/skills/, .agents/skills/
Install the "frb-fix-merge-conflict" agent skill from https://github.com/fzyzcjy/flutter_rust_bridge/tree/master/.claude/skills/frb-fix-merge-conflict into .gemini/skills/frb-fix-merge-conflict/ in this project. Copy the whole folder (SKILL.md and every file beside it), keep the folder name "frb-fix-merge-conflict", then confirm the skill loads.Gemini CLI copies the folder itself, the same result as the manual copy. Check what it changed before you commit it.
$ gh skill install fzyzcjy/flutter_rust_bridge frb-fix-merge-conflictInstalls for Copilot at project scope by default; add --scope user for a personal install. Preview a skill first with gh skill preview. Needs GitHub CLI 2.90.0 or later (public preview).
$ npx skills add fzyzcjy/flutter_rust_bridge --skill frb-fix-merge-conflict -a github-copilotProject install goes to .agents/skills/; add -g for ~/.copilot/skills/.
$ git clone --depth 1 https://github.com/fzyzcjy/flutter_rust_bridge.git skills-src && mkdir -p .github/skills && cp -r skills-src/.claude/skills/frb-fix-merge-conflict .github/skills/frb-fix-merge-conflict && rm -rf skills-srcUse ~/.copilot/skills/ instead of .github/skills for a personal install. Commit .github/skills so cloud agent and code review can use it.
GitHub Copilot skills documentation · loads skills from .github/skills/, .claude/skills/, .agents/skills/
Install the "frb-fix-merge-conflict" agent skill from https://github.com/fzyzcjy/flutter_rust_bridge/tree/master/.claude/skills/frb-fix-merge-conflict into .github/skills/frb-fix-merge-conflict/ in this project. Copy the whole folder (SKILL.md and every file beside it), keep the folder name "frb-fix-merge-conflict", then confirm the skill loads.GitHub Copilot copies the folder itself, the same result as the manual copy. Check what it changed before you commit it.
$ npx skills add fzyzcjy/flutter_rust_bridge --skill frb-fix-merge-conflict -a opencodeOpenCode documents no install command of its own. Project install goes to .agents/skills/; add -g for ~/.config/opencode/skills/.
$ gh skill install fzyzcjy/flutter_rust_bridge frb-fix-merge-conflict --agent opencodeProject scope by default (.agents/skills/); add --scope user for a personal install.
$ git clone --depth 1 https://github.com/fzyzcjy/flutter_rust_bridge.git skills-src && mkdir -p .opencode/skills && cp -r skills-src/.claude/skills/frb-fix-merge-conflict .opencode/skills/frb-fix-merge-conflict && rm -rf skills-srcUse ~/.config/opencode/skills/ instead of .opencode/skills for a personal install.
OpenCode skills documentation · loads skills from .opencode/skills/, .claude/skills/, .agents/skills/
Install the "frb-fix-merge-conflict" agent skill from https://github.com/fzyzcjy/flutter_rust_bridge/tree/master/.claude/skills/frb-fix-merge-conflict into .opencode/skills/frb-fix-merge-conflict/ in this project. Copy the whole folder (SKILL.md and every file beside it), keep the folder name "frb-fix-merge-conflict", then confirm the skill loads.OpenCode copies the folder itself, the same result as the manual copy. Check what it changed before you commit it.
Facts
- Skill name
frb-fix-merge-conflict- GitHub stars
- 5.4k
- Token cost
- ~1.2k tokens
- SKILL.md length
- 562 words
- Files
- 1
- Skills in repo
- 28
- Repo updated
- First seen
- Licence
- MIT
At a glance
A skill your agent uses when resolving merge or rebase conflicts in flutterrustbridge, especially conflicts involving generated files after master/main changed independently from a PR branch.
- Works in 4 steps: Read the FRB environment setup… → Read frb-code-generation to choose the… → If the conflict is discovered through CI… → …
- Resolving merge
- SKILL.md covers Core Rule, Before Starting, Classify Conflicts and Generated File Conflict Workflow, plus 2 more sections
- Calls git
What it does
Frb Fix Merge Conflict is an agent skill from fzyzcjy/flutter_rust_bridge. Use when resolving merge or rebase conflicts in flutterrustbridge, especially conflicts involving generated files after master/main changed independently from a PR branch.
Its SKILL.md is about 1.2k tokens, which your agent loads only when the skill is triggered. It is a single SKILL.md file with no bundled scripts.
It sits in Development, covering Git workflow and Cross-platform mobile apps. It works with Rust, Flutter and Dart. The repository describes itself as: Flutter/Dart <- Rust binding generator, feature-rich, but seamless and simple. The licence is MIT.
When your agent uses it
- Resolving merge
- Rebase conflicts in flutterrustbridge
- Especially conflicts involving generated files after master/main changed independently from a PR branch
Example prompts
- “/frb-fix-merge-conflict”
Requirements
- Docker
Workflow steps
4 steps, taken from the first numbered list in SKILL.md.
- Read the FRB environment setup instructions for the current checkout before running generation or tests.
- Read frb-code-generation to choose the minimal regeneration command.
- If the conflict is discovered through CI or PR checks, read frb-fix-ci before deeper investigation.
- Make sure the worktree starts clean except for the merge/rebase conflict you are intentionally resolving.
What it can do on your machine
Read from SKILL.md and the folder at commit 848e438. It shows what the files ask for, not the result of running them.
Tool permissions
Pre-approves nothing: there is no allowed-tools line, so your agent's usual permission prompts apply.
From allowed-tools in the SKILL.md frontmatter.
Runs code
Shell commands in SKILL.md call:
git
From the folder's file list and the shell code blocks in SKILL.md.
Network
No URLs in SKILL.md. Its commands use git, which can reach the network depending on how they are called.
From URLs in SKILL.md, links to its own repository left out.
Credentials
Names no API keys, tokens, secrets or passwords.
From names ending in _API_KEY, _TOKEN, _SECRET, _KEY or _PASSWORD in SKILL.md.
Context cost
Frb Fix Merge Conflict loads about 1.2k tokens when it runs. Until then it costs about 49 tokens; SKILL.md has 562 words of instructions outside code blocks.
Estimates: characters ÷ 4, the usual rule of thumb; real counts depend on the model's tokenizer. Scripts and assets cost tokens only if the agent reads them.
Safety
Auto-check passed
The automated check found no risky patterns in SKILL.md.
Automated static check — not a guarantee. Review scripts before installing. It scans the text of SKILL.md for risky patterns (piping downloads into a shell, reading credential files, hidden Unicode, destructive commands); files beside SKILL.md are not scanned.
SKILL.md
The full file from fzyzcjy/flutter_rust_bridge at commit 848e438, republished under its MIT licence (© fzyzcjy). 562 words, ~1,207 tokens.
Download SKILL.mdSave it as
.claude/skills/frb-fix-merge-conflict/SKILL.md (or your agent's skills folder).- name
- frb-fix-merge-conflict
- description
- 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.
FRB Fix Merge Conflict
Use this skill before resolving merge or rebase conflicts in flutter_rust_bridge.
Core Rule
Resolve hand-written files semantically. Do not hand-resolve generated files as the final result.
Generated conflict output should be treated as a stale artifact from two independently valid histories. After the hand-written sources are merged, regenerate the generated outputs and commit that regenerated result.
Before Starting
- Read the FRB environment setup instructions for the current checkout before running generation or tests.
- Read
frb-code-generationto choose the minimal regeneration command. - If the conflict is discovered through CI or PR checks, read
frb-fix-cibefore deeper investigation. - Make sure the worktree starts clean except for the merge/rebase conflict you are intentionally resolving.
Classify Conflicts
List unmerged files:
git diff --name-only --diff-filter=UClassify each file into one of these buckets:
| Bucket | Examples | Resolution |
|---|---|---|
| Hand-written source | Rust APIs, codegen logic, Dart tests, docs, configs | Resolve manually with normal semantic merge |
| Generated output | frb_generated.*, *.freezed.dart, *.g.dart, generated API wrappers, generated test entrypoints | Pick one side only as a temporary placeholder, then regenerate |
| Ambiguous generated-like output | lockfiles, copied template outputs, integrate scaffolds | Confirm source of truth before choosing; use frb-fix-ci dependency graph if unsure |
Do not use the generated-file shortcut for hand-written files merely because they are noisy.
Generated File Conflict Workflow
When a generated file conflicts because both base and PR independently added tests or APIs:
- Resolve all hand-written source conflicts first.
- For each generated conflicted file, choose a conflict-free placeholder from either side. The chosen side is not the final answer; it only clears conflict markers so the generator can run.
- Stage those placeholder generated files.
- Run the appropriate generation command from
frb-code-generation. For broad PR-vs-master generated drift, prefer:
./frb_internal precommit-generate For frb_example/pure_dart and frb_example/pure_dart_pde conflicts, the internal generator and package codegen cover different outputs. If the merge touches generated test entrypoints, copied PDE files, or the pure-Dart chain, run:
./frb_internal generate-internal-frb-example-pure-dartIf the merge also brings in hand-written Rust or Dart API changes, run package codegen after the internal generator:
./frb_internal generate-run-frb-codegen-command-generate --package frb_example/pure_dart
./frb_internal generate-run-frb-codegen-command-generate --package frb_example/pure_dart_pde Do not stop after the internal generator when CI errors mention missing methods on generated Dart APIs such as RustLibApi; that usually means the package frb_generated.* files are stale.
- Inspect the regenerated diff. The final generated files should reflect both sides' hand-written sources.
- Commit the merge/rebase resolution.
Show full SKILL.md (181 more words)Show less
Placeholder Commands
For a normal git merge master into a PR branch, this is usually enough for generated paths:
git checkout --ours -- <generated-path>
git add <generated-path>For a git rebase, remember Git reverses the intuitive meaning of ours/theirs: --ours is the branch being rebased onto, and --theirs is the replayed commit. Since generated files are only placeholders, either side can be acceptable if the file still exists and regeneration will overwrite it. When deletion/addition is involved, prefer the side that leaves the path in the shape expected by the generator, then verify after regeneration.
Validation
After regeneration:
git diff --check
git diff --name-only --diff-filter=U
git status --shortThen run the relevant local Docker-backed checks from the project skills. For broad generated-file conflict repairs, start with the same generation command CI would run, then use CI to validate the full matrix.
If CI later reports more generated diff, add the experience back to this skill so the next repair has a sharper rule.
Commit Shape
Keep the conflict-resolution commit focused:
- Include semantic hand-written conflict resolutions.
- Include regenerated outputs from the chosen generation command.
- Do not include unrelated cleanup.
- Mention the generation command in the commit message body when useful.
© fzyzcjy, MIT. Rendered from Markdown: HTML in the file is shown as text, images as links, and headings moved down two levels. Raw file
Files
Just SKILL.md in .claude/skills/frb-fix-merge-conflict of fzyzcjy/flutter_rust_bridge.
Open the folder on GitHubat commit 848e438
Compare with similar skills
Frb Fix Merge Conflict next to the 5 skills that share the most tags, products or categories with it. Stars are the repository's; “used in” counts other GitHub owners with a copy.
| Skill | Stars | Used in | Tokens | Auto-check | Licence | Repo updated |
|---|---|---|---|---|---|---|
| Frb Fix Merge Conflict this skillfzyzcjy/flutter_rust_bridge | 5.4k | — | ~1.2k | Automated safety check: Pass | MIT | |
| Core API Changelibnativeapi/nativeapi | 166 | — | ~2.5k | Automated safety check: Pass | MIT | |
| Puremusicqingyueyin/Pure-music | 188 | — | ~907 | Automated safety check: Pass | GPL-3.0 | |
| Code Guidelinesgetsentry/sentry-dart | 873 | — | ~2.2k | Automated safety check: Pass | MIT | |
| Bump VersionVeryGoodOpenSource/very_good_analysis | 477 | — | ~2.6k | Automated safety check: Pass | MIT | |
| MCP Debuggerdebugmcp/mcp-debugger | 174 | — | ~4.2k | Automated safety check: Pass | MIT |
Similar skills
Puremusic
qingyueyin/Pure-music
Pure-music 项目开发指南，覆盖 Windows Flutter/Dart 前端、Rust 后端、音频播放、歌词解析与渲染、桌面歌词、主题背景、设置、FFI、文档和测试。处理此仓库的代码理解、问题诊断、功能开发、缺陷修复、性能优化或代码审查时使用。
- Official
Code Guidelines
getsentry/sentry-dart
Enforce Sentry Dart/Flutter SDK code guidelines for implementation, refactoring, and review.
Bump Version
VeryGoodOpenSource/very_good_analysis
Bumps the verygoodanalysis package to a new version. An agent skill from VeryGoodOpenSource/very_good_analysis.
MCP Debugger
debugmcp/mcp-debugger
A skill your agent uses when investigating a bug, failing test, or unexpected runtime behavior and the mcp-debugger MCP server is available — drives real step-through debuggers (breakpoints, stack…
Signals Core Advanced Primitives
rodydavis/signals.dart
Reference for the advanced parts of Dart's signals_core: reactive primitives, async signals, reactive collections and utility types, with a linked page for each.
More from fzyzcjy/flutter_rust_bridge
All 28 skills in this repoFrb Add Contributor
fzyzcjy/flutter_rust_bridge
Add or reconcile flutterrustbridge contributors through all-contributors PRs.
Frb Android Emulator Prepare
fzyzcjy/flutter_rust_bridge
A skill your agent uses when preparing, installing, diagnosing, or explaining the host Android Emulator environment for flutterrustbridge local runtime validation, including Android SDK command-line…
Frb Cargokit Dev
fzyzcjy/flutter_rust_bridge
Develop or update CargoKit for flutterrustbridge. An agent skill from fzyzcjy/flutter_rust_bridge.
Frb Categorize Code Diff
fzyzcjy/flutter_rust_bridge
A skill your agent uses when classifying a flutterrustbridge branch or PR diff into test and non-test changes, including colocated Rust test modules.
Frb CI Filter
fzyzcjy/flutter_rust_bridge
A skill your agent uses when running focused flutterrustbridge GitHub Actions CI via cifilter, adding/removing the ci-manual-dispatch PR label, choosing exact CI jobs or matrix entries, documenting…
Frb Code Generation
fzyzcjy/flutter_rust_bridge
A skill your agent uses when modifying Rust APIs, codegen, generated examples, or platform scaffolds in flutterrustbridge to select generation commands and preserve source-of-truth and convergence…
Related
Categories
Questions about Frb Fix Merge Conflict
What does Frb Fix Merge Conflict do?
A skill your agent uses when resolving merge or rebase conflicts in flutterrustbridge, especially conflicts involving generated files after master/main changed independently from a PR branch. Frb Fix Merge Conflict is an agent skill from fzyzcjy/flutter_rust_bridge. Use when resolving merge or rebase conflicts in flutterrustbridge, especially conflicts involving generated files after master/main changed independently from a PR branch.
When should I use Frb Fix Merge Conflict?
Frb Fix Merge Conflict fits situations like: resolving merge; rebase conflicts in flutterrustbridge; especially conflicts involving generated files after master/main changed independently from a PR branch.
How do I install Frb Fix Merge Conflict in Claude Code?
Run `npx skills add fzyzcjy/flutter_rust_bridge --skill frb-fix-merge-conflict -a claude-code`. Or copy the skill folder (.claude/skills/frb-fix-merge-conflict in fzyzcjy/flutter_rust_bridge) into .claude/skills/frb-fix-merge-conflict in your project. Claude Code loads it when a task matches its description.
How do I install Frb Fix Merge Conflict in Codex?
Run `npx skills add fzyzcjy/flutter_rust_bridge --skill frb-fix-merge-conflict -a codex`. Or copy the skill folder (.claude/skills/frb-fix-merge-conflict in fzyzcjy/flutter_rust_bridge) into .agents/skills/frb-fix-merge-conflict in your project. Codex loads it when a task matches its description.
Can I use Frb Fix Merge Conflict in Cursor, Gemini CLI or GitHub Copilot?
Cursor, Gemini CLI, GitHub Copilot and OpenCode also load SKILL.md folders. With the skills CLI, run `npx skills add fzyzcjy/flutter_rust_bridge --skill frb-fix-merge-conflict -a cursor` (or -a gemini-cli, github-copilot or opencode for the others). To copy it by hand, put the folder in .cursor/skills/frb-fix-merge-conflict, .gemini/skills/frb-fix-merge-conflict, .github/skills/frb-fix-merge-conflict and .opencode/skills/frb-fix-merge-conflict in your project.
What does Frb Fix Merge Conflict need to run?
Going by SKILL.md and its folder, Frb Fix Merge Conflict needs the command-line tools its instructions call (git). Our summary lists: Docker.
Does Frb Fix Merge Conflict access the network?
SKILL.md contains no URLs. Its commands use git, which can reach the network depending on how they are called. This is read from the text; nothing was executed.
Is Frb Fix Merge Conflict safe to install?
Our automated static check of SKILL.md found no risky patterns, such as piping downloads into a shell, reading credential files or hidden Unicode. It is not a guarantee. Review the folder before installing.
What licence does Frb Fix Merge Conflict use?
Frb Fix Merge Conflict is published under the MIT licence (the repository's licence). It allows redistribution, so the full SKILL.md is shown on this page.
How many tokens does Frb Fix Merge Conflict use?
About 1.2k tokens (SKILL.md is roughly 4.8k characters). Agents keep only the skill's name and description in context until a task matches; then they load SKILL.md in full.
What are the alternatives to Frb Fix Merge Conflict?
Skills that share tags, products or a category with Frb Fix Merge Conflict: Core API Change (libnativeapi/nativeapi, 166 stars), Puremusic (qingyueyin/Pure-music, 188 stars), Code Guidelines (getsentry/sentry-dart, 873 stars) and Bump Version (VeryGoodOpenSource/very_good_analysis, 477 stars). The comparison table on this page puts their stars, adoption, token cost, safety result and licence side by side.
Who maintains Frb Fix Merge Conflict?
fzyzcjy (a GitHub user) maintains it in fzyzcjy/flutter_rust_bridge, which has 5,446 GitHub stars. The repository holds 28 skills in this directory. The repository was last updated on October 10, 2026.
Source: fzyzcjy/flutter_rust_bridge on GitHub. Facts on this page come from the repository at the commit we read; the author's words are quoted as theirs.