Enum ResolveWith

pub enum ResolveWith {
    Ancestor,
    Ours,
}

Decide how to resolve tree-related conflicts, but only those that have no way of being correct.

Variants

Ancestor

On irreconcilable conflict, choose neither our nor their state, but keep the common ancestor state instead.

Ours

On irreconcilable conflict, choose our side.

Note that in order to get something equivalent to theirs, put theirs into the side of ours, swapping the sides essentially.

Trait Implementations

impl Clone for ResolveWith

fn clone(&self) -> ResolveWith

Returns a copy of the value.

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

Performs copy-assignment from source.

impl Debug for ResolveWith

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

Formats the value using the given formatter.

impl Hash for ResolveWith

fn hash<__H: Hasher>(&self, state: &mut __H)

Feeds this value into the given Hasher.

fn hash_slice<H>(data: &[Self], state: &mut H)

where H: Hasher, Self: Sized,

Feeds a slice of this type into the given Hasher.

impl Ord for ResolveWith

fn cmp(&self, other: &ResolveWith) -> Ordering

This method returns an Ordering between self and other.

fn max(self, other: Self) -> Self

where Self: Sized,

Compares and returns the maximum of two values.

fn min(self, other: Self) -> Self

where Self: Sized,

Compares and returns the minimum of two values.

fn clamp(self, min: Self, max: Self) -> Self

where Self: Sized,

Restrict a value to a certain interval.

impl PartialEq for ResolveWith

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

fn partial_cmp(&self, other: &ResolveWith) -> Option<Ordering>

This method returns an ordering between self and other values if one exists.

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

Tests less than (for self and other) and is used by the < operator.

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

Tests less than or equal to (for self and other) and is used by the <= operator.

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

Tests greater than (for self and other) and is used by the > operator.

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

Tests greater than or equal to (for self and other) and is used by the >= operator.

impl Copy for ResolveWith

impl Eq for ResolveWith

impl StructuralPartialEq for ResolveWith