CommitMergeConflict

class dsviper.CommitMergeConflict

Bases: object

A single locus, anchored on a path, where one branch’s intent did not survive the merge, reconstructed as base/ours/theirs/merged values.

Note: Not directly instantiable.

attachment() → Attachment

Return the attachment the conflicting key belongs to.

base_value() → ValueOptional

Return the value at the merge base (nil in 2-way mode).

key() → ValueKey

Return the conflicting key.

merged_value() → ValueOptional

Return the value the merge actually produced at this locus.

ours_value() → ValueOptional

Return the value on the parent (ours) side.

path() → PathConst

Return the locus inside the document where the intent was lost (root for a scalar attachment).

theirs_value() → ValueOptional

Return the value on the target (theirs) side.