# orchestrator: merge preview trusts git's exit code and NUL-separated paths · lucenx/signaltty

[View on GitCafe](https://git.cafe/lucenx/signaltty/commit/da9efe10d153b10d897f22c557c384db45c07d74)

Repository: [lucenx/signaltty](https://git.cafe/lucenx/signaltty)

Visibility: public

Requested revision: da9efe10d153b10d897f22c557c384db45c07d74

Requested commit: da9efe10d153b10d897f22c557c384db45c07d74

Commit: da9efe10d153b10d897f22c557c384db45c07d74

Tree: 7c6e0d1608923a6a154257adcd17dfb5c0f5d69a

Author: Lucenx9

Committer: Lucenx9

## Message

```
orchestrator: merge preview trusts git's exit code and NUL-separated paths

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>

```

## Parents

- [9cfc3c01b47208a137fbbfdfafb141168971508b](https://git.cafe/lucenx/signaltty/commit/9cfc3c01b47208a137fbbfdfafb141168971508b?format=markdown)

[Source at this commit](https://git.cafe/lucenx/signaltty/tree/da9efe10d153b10d897f22c557c384db45c07d74?format=markdown)