Разрешение конфликтов слияния в flutter_rust_bridge

engineering

frb-fix-merge-conflict is a Claude Code skill that guides the resolution of merge and rebase conflicts in flutter_rust_bridge, with a focus on correctly handling generated files. It classifies unmerged paths into three buckets — hand-written sources (Rust APIs, Dart tests, configs), generated outputs (frb_generated.*, *.freezed.dart, *.g.dart), and ambiguous artifacts — and applies different strategies to each. Hand-written files are resolved semantically; generated files are cleared with a placeholder via `git checkout --ours` and then fully regenerated using commands like `./frb_internal precommit-generate` or package-specific variants for frb_example/pure_dart. Post-regeneration validation uses `git diff --check` and `git diff --name-only --diff-filter=U` before committing. This skill is intended for contributors managing long-running PR branches where master and the branch have independently drifted in generated code.