How a reviewer closed a conflict, in the queue's own spelling.
The three members are exactly the members of the shipped
ConflictResolutionChoice the queue can act on without a server. merge is
absent on purpose: a merged value would have to replace the edit's payload,
and the edit's identity is a digest of that payload, so recording a merge
here would silently rewrite an idempotency identity the transport has
already used. The offline conflict-resolution surface refuses merge rather
than accepting one it cannot honour.
How a reviewer closed a conflict, in the queue's own spelling.
The three members are exactly the members of the shipped
ConflictResolutionChoicethe queue can act on without a server.mergeis absent on purpose: a merged value would have to replace the edit's payload, and the edit's identity is a digest of that payload, so recording a merge here would silently rewrite an idempotency identity the transport has already used. The offline conflict-resolution surface refusesmergerather than accepting one it cannot honour.