Struct TreatAsUnresolved

pub struct TreatAsUnresolved {
    pub content_merge: ContentMerge,
    pub tree_merge: TreeMerge,
}

Determine what should be considered an unresolved conflict.

Fields

content_merge: ContentMerge

Determine which content merges should be considered unresolved.

tree_merge: TreeMerge

Determine which tree merges should be considered unresolved.

Implementations

impl TreatAsUnresolved

Instantiation/Presets

pub fn forced_resolution() -> Self

Return an instance with the highest sensitivity to what should be considered unresolved as it includes entries which have been resolved using a merge strategy.

pub fn git() -> Self

Return an instance that considers unresolved any conflict that Git would also consider unresolved. This is the same as the default() implementation.

pub fn undecidable() -> Self

Only undecidable tree merges and conflict markers are considered unresolved. This also means that renamed entries to make space for a conflicting one is considered acceptable, making this preset the most lenient.

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 Default for TreatAsUnresolved

fn default() -> TreatAsUnresolved

Returns the “default value” for a type.

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