Resolve Git merge, rebase, or cherry-pick conflicts through a structural merge cascade. Run mergiraf first, Git rerere second, and kdiff3 last. Use this skill when conflicts exist or Git shows an incomplete operation. Trigger phrases include "melt the conflicts", "resolve the rebase conflicts", and

/melt Resolve the current conflict without rewriting a published branch. Use the safe cascade: squash repair → summary → mergiraf → rerere → manual resolution → continuation. Keep the original branch for recovery. Never push, reset, or force push here. Use the selected source code backend for searches, bounded reads, and manual edits. Follow [code intelligence routing](../cheese/references/code intelligence routing.md): search, fresh read, stale safe write. 1. Repair squash residue Run this before resolving file conflicts: Use base <ref when the base is not origin/main . Use branch <name when Git cannot identify the original branch. The command previews by default without apply . It creates <original branch clean and replays verified commits in order when safe. Otherwise it merges the base into the original branch. It preflights branch collisions before aborting an interrupted operation. It never pushes or rewrites either branch. If application.state is confirmation required , keep the active operation intact. Ask once whether to discard its staged resolution and abort it. After explicit confirmation, rerun with apply abort operation . If confirmation is refused, continue the existing operation instead. If application.state is failed , report failed step , error , and recovery branch ; stop. If it is needs resolution , continue the cascade. If it is applied without conflicts, check the operation state and proceed to handoff. If it is not applied , continue the existing conflict. 2. Diagnose and inspect Read each summary hunk and the operation's unmerged paths and conflict marker files . Use git log merge oneline only when commit intent is unclear. Do not accept a structural merge only because it has no markers. 3. Resolve structures Preview mergiraf, then inspect its semantic result before applying it: The debug command gives the merged output path, log path, and marker count. Read that output with the selected backend. Confirm that both sides' intended edits remain. Then apply clean resolutions and stage them: Melt text tools refuse binary files. Select a side for ordinary binaries and stage it. For generated archives, resolve source files and rebuild the archive instead. 4. Resolve what remains Run operation again. Its rerere enabled , configured merge tool , and selected manual tool fields define the available fallback. When rerere is enabled, inspect git rerere status and git rerere diff . If it is disabled, report the setting and skip that stage. Do not change global Git configuration during this invocation. For unresolved text, use the selected manual tool or edit after semantic inspection. Prefer git mergetool tool=kdiff3 <path when selected manual tool is kdiff3 . Otherwise use the configured tool and report the substitution. Stage each resolved path. Resolve lockfiles from their manifests, not their conflict text. Read [conditional cascade stages](references/cascade stages.md) only when selecting sides, regenerating lockfiles, debugging mergiraf, or maintaining rerere data. Its side selection and lockfile commands require a judgment about intended content. 5. Continue once Run continue only when status is ready . It refuses unmerged paths and conflict markers, then continues without an interactive editor. If it returns blocked , resolve the next conflict and repeat steps 2–5. If it returns failure , report failed step and stop. Handoff only when status is complete . Do not run a separate raw Git continuation command. Handoff After completion, use the [shared handoff gate](../cheese/references/handoff gate.md). Fill the placeholders from the upstream invocation and propagated flags. Omit rerun upstream and recommend stop when its invocation is unknown. Wait for the user's selection. Run a selected non stop action immediately. Melt never commits or pushes. /plate owns publication. See the [generated command inventory](references/commands.md) for all Melt commands.