meltlisted

# /melt Use this skill to resolve Git conflicts with this cascade: **mergiraf → rerere → kdiff3**. Each stage handles conflicts that remain after the prior stage. ## File IO routing Use the selected source-code backend for conflict searches, bounded reads, and manual edits. Follow the route in [`code-intelligence-routing.md`](../cheese/references/code-intelligence-routing.md). Use this sequence for manual resolutions: search, fresh bounded read, stale-safe write. ## Cascade | Stage | Tool | Purpose | Start condition | | --- | --- | --- | --- | | 1 | `mergiraf` | Merges syntax trees and preserves independent additions. It uses text merge after a parse failure. | Git starts it as a merge driver, or the user runs `batch-resolve`. | | 2 | `git rerere` | Reuses a recorded human resolution for the same conflict signature. | Run it after mergiraf when `rerere.enabled` is `true`. | | 3 | `kdiff3` | Provides a manual three-way diff for unresolved conflicts. | Start it with `git mergetool --tool=kdiff3`. | ## Protocol ### 0. Check for squash residue Run this check before the conflict summary. ```bash python3 skills/melt/scripts/melt.pyz detect-squash-residue ``` If the verdict is `SQUASH-MERGED`, stop the cascade. Show both printed remedies to the user without changes. Do not apply either remedy automatically. The user selects and copies one remedy. Flags: - `--base` — Sets the base ref. The default is `origin/main`. - `--branch` — Sets the branch. The default is the curren