melt
Installation
SKILL.md
/melt
Use this skill to resolve git merge, rebase, or cherry-pick conflicts using the structural cascade: mergiraf → rerere → kdiff3. Each tool handles what the previous could not.
File IO routing
For conflict-marker or symbol search, bounded inspection, and manual edits, call the selected source-code backend directly according to code-intelligence-routing.md. Preserve search → fresh bounded read → stale-safe write when applying a manual resolution.
Cascade
| Stage | Tool | What it does | When it runs |
|---|---|---|---|
| 1 | mergiraf |
Tree-sitter structural merge of base / ours / theirs. Independent additions merge cleanly even when text merge would conflict. Falls back to text merge on parse failure. | Automatically as a git merge driver, or via python3 ${CLAUDE_SKILL_DIR}/scripts/melt.pyz batch-resolve. |
| 2 | git rerere |
Replays a previously recorded human resolution for the same conflict signature. | After mergiraf, especially during long rebases where conflicts recur. |
| 3 | kdiff3 |
Manual 3-way diff for what mergiraf and rerere could not resolve. | Launched via git mergetool. |