Enum TreatAsUnresolved

pub enum TreatAsUnresolved {
    ConflictMarkers,
    ConflictMarkersAndAutoResolved,
    Renames,
    RenamesAndAutoResolvedContent,
}

Determine what should be considered an unresolved conflict.

Note that no matter which variant, conflicts with resolution failure will always be unresolved.

Also, when one side was modified but the other side renamed it, this will not be considered a conflict, even if a non-conflicting merge happened.

Variants

ConflictMarkers

Only consider content merges with conflict markers as unresolved.

Auto-resolved tree conflicts will not be considered unresolved.

ConflictMarkersAndAutoResolved

Consider content merges with conflict markers as unresolved, and content merges where conflicts where auto-resolved in any way, like choosing ours, theirs or by their union.

Auto-resolved tree conflicts will not be considered unresolved.

Renames

Whenever there were conflicting renames, or conflict markers, it is unresolved. Note that auto-resolved content merges will not be considered unresolved.

Also note that files that were changed in one and renamed in another will be moved into place, which will be considered resolved.

RenamesAndAutoResolvedContent

Similar to Self::Renames, but auto-resolved content-merges will also be considered unresolved.

Trait Implementations

impl Clone for TreatAsUnresolved

fn clone(&self) -> TreatAsUnresolved

Returns a copy of the value.

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

Performs copy-assignment from source.

impl Debug for TreatAsUnresolved

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

Formats the value using the given formatter.

impl Hash for TreatAsUnresolved

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 TreatAsUnresolved

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

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

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

impl Eq for TreatAsUnresolved

impl StructuralPartialEq for TreatAsUnresolved