CommitMergeResolution

class dsviper.CommitMergeResolution(conflict, chosen)

Bases: object

A supervisor’s decree for one reconstructed conflict: the chosen value should survive at the conflict’s locus. A root locus decrees the whole document. chosen is checked against the type the locus declares.

chosen(*, encoded: Literal[True] = True) → _OutputValues

Return the dictated value at the conflict’s locus.

encoded=False returns a Value rather than a native object.

conflict() → CommitMergeConflict

Return the reconstructed conflict this resolution decrees.