CommitMergeResolution

class dsviper.CommitMergeResolution(conflict, chosen)

Bases: object

A supervisor’s decree for one conflict: the chosen value should survive at the conflict’s locus. A root locus decrees the whole document.

chosen() → Value

Return the dictated value at the conflict’s locus.

conflict() → CommitMergeConflict

Return the conflict this resolution decrees.