Enum MergeConflictResolution 

pub enum MergeConflictResolution {
    KeptBase,
    KeptIncoming,
    Failed,
    Merged,
}

How a merge conflict was resolved.

Variants

KeptBase

Kept the base version

KeptIncoming

Kept the incoming version

Failed

Failed to resolve

Merged

Merged both (only for compatible items)

Trait Implementations

impl Clone for MergeConflictResolution

fn clone(&self) -> MergeConflictResolution

Returns a duplicate of the value.

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

Performs copy-assignment from source.

impl Debug for MergeConflictResolution

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

Formats the value using the given formatter.

impl PartialEq for MergeConflictResolution

fn eq(&self, other: &MergeConflictResolution) -> 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 Copy for MergeConflictResolution

impl Eq for MergeConflictResolution

impl StructuralPartialEq for MergeConflictResolution