# Check an offline merge's place, and replay merge refusals legibly · dara/icarus

[View on GitCafe](https://git.cafe/dara/icarus/commit/f1a1540b3d373b313e62d6f191c2b0d4b46fd09c)

Repository: [dara/icarus](https://git.cafe/dara/icarus)

Visibility: public

Requested revision: f1a1540b3d373b313e62d6f191c2b0d4b46fd09c

Requested commit: f1a1540b3d373b313e62d6f191c2b0d4b46fd09c

Commit: f1a1540b3d373b313e62d6f191c2b0d4b46fd09c

Tree: ab76c4d09087e9b7b8ed7152a9b877e56383063d

Author: Dara Adedeji

Committer: Dara Adedeji

## Message

```
Check an offline merge's place, and replay merge refusals legibly

An offline merge that restacks a row a teammate restacked meanwhile is
refused like any field collision. A merge refusal replayed by a client
that sends no merge (an older tab reading a shared outbox) reads as a
revision mismatch, the reason it can decode.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

```

## Parents

- [50d7e35ec6dbefe4b3ddea5327c51a4b3851c11c](https://git.cafe/dara/icarus/commit/50d7e35ec6dbefe4b3ddea5327c51a4b3851c11c?format=markdown)

[Source at this commit](https://git.cafe/dara/icarus/tree/f1a1540b3d373b313e62d6f191c2b0d4b46fd09c?format=markdown)