melt
Installation
SKILL.md
/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.
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. |