メニュー
Merge an upstream branch into a recipe development branch by comparing branch deltas, mapping shared-contract breakages, resolving conflicts, adapting the recipe, validating affected paths, and completing the merge safely.
Codex または Claude でインストール この Prompt をコピーして Codex、Claude、または他のアシスタントに貼り付けると、Skill ページを確認してインストールできます。
SOC 職業分類に基づく
Use and extend the MVP-Engine MLLM data kit with explicit specs, handlers, and sample objects. Use for recipe data wiring, MLLMDataSpec construction, source resample/resolve_refs policy, schema/media/tokenization handlers, packing, guards, collation, dataloader setup, Qwen VL data support, and multimodal data extensions.
Add, review, update, and validate recipe-local sequence-parallel plans that reuse the tensor-parallel mesh in mvp-engine models.
Add, review, update, and validate recipe-local tensor-parallel plans, TP metadata postprocessors, and compatible mesh config for mvp-engine models.
Add, review, update, and validate VLM/MLLM data pipelines using the current spec/handler-based MLLMDataKit design. Use for raw schema normalization, MLLMDataSpec wiring, source resample/resolve_refs policy, media extensions, processor setup, packing, guards, collation, step estimation, and recipe integration.
Add, review, update, and validate VLM/MLLM packing behavior around the current MLLMDataKit design, including MLLMPackingSpec, MLLMPackingAssembler, MLLMPack metadata, block-causal masks, model-specific packed input preparation, token accounting, and step estimation.
Use LigerKernelKit for reusable Liger Kernel integration before model construction, covering official model-family dispatch, custom-model symbol patching via LigerPatch, module selection validation, and loss-kernel guards.
| name | recipe-merge-repair |
| description | Merge an upstream branch into a recipe development branch by comparing branch deltas, mapping shared-contract breakages, resolving conflicts, adapting the recipe, validating affected paths, and completing the merge safely. |
Safely absorb upstream changes into the current recipe branch:
Keep fixes inside recipes/<recipe>/ whenever possible. Modify mvp_engine/
only when the issue clearly belongs to shared infrastructure.
Identify these before running a merge:
main;Ask the user before proceeding if the merge could overwrite unrelated dirty files or if validation requires unavailable resources.
Do not start with git merge. First inspect:
git branch --show-current
git status --short
git merge-base <current_branch> <upstream_branch>
Record what the merge must preserve: target recipe capabilities, entrypoints, configs, and validation goal.
Compare upstream-only, current-only, and overlapping changes:
git diff --name-status <merge_base>..<upstream_branch>
git diff --name-status <merge_base>..<current_branch>
git diff --name-status <current_branch>...<upstream_branch>
Read references/merge_rules.md for the full comparison checklist and hotspot
mapping rules.
Inspect the target recipe's engine, model, data, config, registration, tests, and shared-layer call sites.
Build a breakage map:
After the hotspot map is clear, merge without committing:
git merge --no-commit --no-ff <upstream_branch>
Resolve conflicts by final behavior, not conflict-block convenience. Preserve recipe-local goals while adapting to new shared contracts.
Run the smallest validation that proves repaired paths work, then broader checks when feasible. At minimum, run:
git diff --check
git status --short
Only complete the merge commit after conflicts are resolved and validation is sufficient for the requested scope.
Confirm:
Run targeted post-merge validation for each repaired breakage class. Depending on scope, this may include imports, structure tests, smoke tests, startup, training, evaluation, or recipe-specific checks.
Always run git diff --check before finalizing. Do not report the merge as
complete if validation ran on a pre-merge or partially resolved tree.
references/merge_rules.md: branch comparison, hotspot mapping, repair, and
validation checklist.