fix: harden ghost-conflict recovery after forced sync#26

dubscode merged 1 commit intomainwiseiodev/dubstack:mainfrom

codex/fix-ghost-conflict-followupswiseiodev/dubstack:codex/fix-ghost-conflict-followupsCopy head branch name to clipboard