Struct ConflictRecord 

pub struct ConflictRecord {
    pub conflict_id: ConflictId,
    pub sig_id: SigId,
    pub kind: ConflictKind,
    pub base: Option<StageId>,
    pub ours: Option<StageId>,
    pub theirs: Option<StageId>,
}

Snapshot of one conflict the agent needs to resolve.

Fields

conflict_id: ConflictId

sig_id: SigId

kind: ConflictKind

base: Option<StageId>

Stage on the LCA. None for AddAdd (no shared base) and for sigs that didn’t exist on the LCA.

ours: Option<StageId>

Stage on the dst (ours) side of the merge. None if dst removed it.

theirs: Option<StageId>

Stage on the src (theirs) side of the merge. None if src removed it.

Trait Implementations

impl Clone for ConflictRecord

fn clone(&self) -> ConflictRecord

Returns a duplicate of the value.

fn clone_from(&mut self, source: &Self)

Performs copy-assignment from source.

impl Debug for ConflictRecord

fn fmt(&self, f: &mut Formatter<'_>) -> Result

Formats the value using the given formatter.

impl<'de> Deserialize<'de> for ConflictRecord

fn deserialize<__D>(__deserializer: __D) -> Result<Self, __D::Error>

where __D: Deserializer<'de>,

Deserialize this value from the given Serde deserializer.

impl PartialEq for ConflictRecord

fn eq(&self, other: &ConflictRecord) -> bool

Tests for self and other values to be equal, and is used by ==.

fn ne(&self, other: &Rhs) -> bool

Tests for !=. The default implementation is almost always sufficient, and should not be overridden without very good reason.

impl Serialize for ConflictRecord

fn serialize<__S>(&self, __serializer: __S) -> Result<__S::Ok, __S::Error>

where __S: Serializer,

Serialize this value into the given Serde serializer.

impl Eq for ConflictRecord

impl StructuralPartialEq for ConflictRecord