/melt Resolve the current conflict without rewriting a published branch. Use the safe cascade: squash repair → summary → mergiraf → rerere → manual resolution → continuation. Keep the original branch for recovery. Never push, reset, or force-push here. Use the selected source-code backend for searches, bounded reads, and manual edits. Follow code-intelligence routing: search, fresh read, stale-safe write. 1. Repair squash residue Run this before resolving file conflicts: Use when the base is not . Use when Git cannot identify the original branch. The command previews by default without . It c…