Enum Pick

pub enum Pick {
    Ancestor,
    Ours,
    Theirs,
    Buffer,
}

An identifier to tell us how a merge conflict was resolved by builtin_merge.

Variants

Ancestor

In a binary merge, chose the ancestor.

Use PlatformRef::buffer_by_pick() to retrieve it.

Ours

In a binary merge, chose our side.

Use PlatformRef::buffer_by_pick() to retrieve it.

Theirs

In a binary merge, chose their side.

Use PlatformRef::buffer_by_pick() to retrieve it.

Buffer

New data was produced with the result of the merge, to be found in the buffer that was passed to builtin_merge(). This happens for any merge that isn’t a binary merge.

Trait Implementations

impl Clone for Pick

fn clone(&self) -> Pick

Returns a copy of the value.

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

Performs copy-assignment from source.

impl Debug for Pick

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

Formats the value using the given formatter.

impl Hash for Pick

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 Pick

fn cmp(&self, other: &Pick) -> 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 Pick

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

fn partial_cmp(&self, other: &Pick) -> 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 Pick

impl Eq for Pick

impl StructuralPartialEq for Pick