Struct Conflict 

pub struct Conflict {
    pub path: String,
    pub kind: ConflictKind,
    pub base_hash: Option<Hash>,
    pub ours_hash: Option<Hash>,
    pub theirs_hash: Option<Hash>,
    pub ours_mode: Option<EntryMode>,
    pub theirs_mode: Option<EntryMode>,
}

Single conflict report. base_hash, ours_hash, theirs_hash are None whenever the corresponding side does not contain the path (Add/Add has no base; Delete/Modify has no hash on the deleting side).

Fields

path: String

kind: ConflictKind

base_hash: Option<Hash>

ours_hash: Option<Hash>

theirs_hash: Option<Hash>

ours_mode: Option<EntryMode>

Tree mode of the ours-side entry (None when ours deleted the path). Carried so a downstream resolver can stage the ours-side with its real exec/symlink mode instead of defaulting to a plain blob (#214).

theirs_mode: Option<EntryMode>

Tree mode of the theirs-side entry (None when theirs deleted the path).

Trait Implementations

impl Clone for Conflict

fn clone(&self) -> Conflict

Returns a duplicate of the value.

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

Performs copy-assignment from source.

impl Debug for Conflict

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

Formats the value using the given formatter.

impl Eq for Conflict

impl From<&Conflict> for ConflictRecord

fn from(c: &Conflict) -> Self

Converts to this type from the input type.

impl PartialEq for Conflict

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

Equality operator ==.

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

Inequality operator !=.

impl StructuralPartialEq for Conflict