ReadonlyacknowledgementReadonlychoiceReadonlyconflictReadonlydetectedCarried from the conflict this resolution closed.
ReadonlydispositionOptional ReadonlynoteReviewer note; screened before it is persisted.
ReadonlyresolvedOptional ReadonlyresolvedOpaque non-secret reviewer identity; screened before it is persisted.
Optional ReadonlyserverCarried from the conflict this resolution closed, when it named one.
The closure of one conflict, recorded against the edit that raised it.
It carries the closed conflict's identity and timing —
conflictId,detectedAt,serverGeneration— because theconflictoutcome itself is cleared by the transition: a record must not claim to be both conflicted and resolved. The audit history keeps the ordered account; this member is the current outcome slot, exactly asappliedandcancellationare.