meltlisted

Resolve git merge, rebase, or cherry-pick conflicts via a structural-merge cascade — mergiraf (AST-aware auto-resolve) → git rerere (replay remembered fixes) → kdiff3 (manual fallback). Use when conflicts exist and the user wants them resolved — phrases like "melt the conflicts", "fix the merge conflicts", "resolve the rebase conflicts", "what's conflicting after the merge", "/melt", "fix the cherry-pick", or any prompt that surfaces `<<<<<<<` markers, `CONFLICT (...)` git output, or a half-finished merge state. Use even when only one file is conflicting if the user wants the structural pass attempted before manual editing. Do NOT use for general git operations without conflicts. After `/cook` or `/cure` if a merge step blocked them; before retrying the gate that surfaced the conflict.
paulnsorensen/easy-cheese · ★ 12 · Code & Development · score 75

Install: claude install-skill paulnsorensen/easy-cheese

# /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 delegation For per-file inspection or manual edits, delegate to the `cheez-*` skills: - **`/cheez-search`** — locate conflict markers or related symbols across the tree. - **`/cheez-read`** — inspect conflicted files, view conflict hunks, list directory contents. - **`/cheez-write`** — apply tag-anchored resolutions when bash flows are not enough. ## 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`. | ## Protocol ### 0. Squash-residue check Run this before the conflict summary. If the branch was squash-merged into base, mergiraf cannot help — see the two remedies below. ```bash python3 ${CLAUDE_SKILL_DIR}/scripts/melt.pyz detect-squash-residue ``` If the verdict