Enum Resolution 

pub enum Resolution {
    KeepOurs,
    KeepTheirs,
    KeepBoth,
    Drop,
}

How to resolve a single conflict.

Variants

KeepOurs

Keep the value from branch A (current HEAD).

KeepTheirs

Keep the value from branch B (incoming).

KeepBoth

Keep both values as separate triples.

Drop

Drop both values (neither survives the merge).

Trait Implementations

impl Clone for Resolution

fn clone(&self) -> Resolution

Returns a duplicate of the value.

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

Performs copy-assignment from source.

impl Debug for Resolution

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

Formats the value using the given formatter.

impl PartialEq for Resolution

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

impl StructuralPartialEq for Resolution