Some conflicts (directory renames) name no file, so clean comes from the
exit code; -z avoids quotePath escapes; duplicate paths are dropped. The
CLI refuses --keep-branch with --discard and says which flag applies.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>