메뉴
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.
기본적으로 소스를 먼저 확인하는 Prompt가 선택됩니다. 직접 명령으로 전환하거나 로컬 사본을 다운로드할 수도 있습니다.
설치 여부를 결정하기 전에 SKILL.md와 SkillsMP에 표시된 보조 파일을 읽어 보세요.
Codex 또는 Claude로 설치 이 Prompt를 복사해 Codex, Claude 또는 다른 어시스턴트에 붙여 넣으면 Skill 페이지를 검토하고 설치를 진행할 수 있습니다.
직접 명령은 검토 Prompt를 거치지 않습니다. 실행하기 전에 소스를 확인하세요.
npx skills add https://github.com/fzyzcjy/flutter_rust_bridge --skill frb-fix-merge-conflict명령은 한 줄로 유지됩니다. 복사하기 전에 가로로 스크롤해 전체 내용을 확인하세요.
로컬 사본을 원하시나요? SkillsMP에서 현재 제공할 수 있는 파일을 다운로드하세요.
SKILL.md 표시 중
Review a flutter_rust_bridge PR before treating it as ready, including subagent checks for correctness and test weakening.
Update flutter_rust_bridge CHANGELOG.md for a new release by collecting merged PRs since the previous version tag, mapping them to the target release section, and formatting entries to match the existing changelog style. Use when writing or refreshing a release section in CHANGELOG.md.
Use when modifying Rust API, codegen, or example code in flutter_rust_bridge to determine which generation commands to run
SOC 직업 분류 기준
| 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. |
Use this skill before resolving merge or rebase conflicts in flutter_rust_bridge.
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.
frb-code-generation to choose the minimal regeneration command.frb-fix-ci before deeper investigation.List unmerged files:
git diff --name-only --diff-filter=U
Classify 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.
When a generated file conflicts because both base and PR independently added tests or APIs:
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-dart
If 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.
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.
After regeneration:
git diff --check
git diff --name-only --diff-filter=U
git status --short
Then 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.
Keep the conflict-resolution commit focused: