melt

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 "fix the cherry-pick". Do not use this skill for Git operations without conflicts. Use it after /cook or /cure when a…