CommitMergeConflict¶
- class dsviper.CommitMergeConflict¶
Bases:
objectA single locus where one head’s intent did not survive the merge.
Anchored on a path, and reconstructed as base/ours/theirs/merged values.
Note: Not directly instantiable.
- attachment() Attachment¶
Return the attachment this locus belongs to.
- base_value() ValueOptional¶
Return the value at the merge base, an optional that is nil in 2-way mode.
- merged_value() ValueOptional¶
Return the value the state reconstructed at the merge commit holds 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.