Enum Conflict

pub enum Conflict {
    Keep {
        style: ConflictStyle,
        marker_size: usize,
    },
    ResolveWithOurs,
    ResolveWithTheirs,
    ResolveWithUnion,
}

What to do to resolve a conflict.

Variants

Keep

Keep the conflict by marking it in the source file.

Fields

style: ConflictStyle

How to visualize conflicts in merged files.

marker_size: usize

The amount of markers to draw, defaults to 7, i.e. <<<<<<<

ResolveWithOurs

Chose our side to resolve a conflict.

ResolveWithTheirs

Chose their side to resolve a conflict.

ResolveWithUnion

Place our and their lines one after another, in any order

Implementations

impl Conflict

pub const DEFAULT_MARKER_SIZE: usize = 7usize

The amount of conflict marker characters to print by default.

pub fn marker_size(&self) -> Option<usize>

The amount of conflict markers to print if this instance contains them, or None otherwise

Trait Implementations

impl Clone for Conflict

fn clone(&self) -> Conflict

Returns a copy of the value.

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

Performs copy-assignment from source.

impl Debug for Conflict

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

Formats the value using the given formatter.

impl Default for Conflict

fn default() -> Self

Returns the “default value” for a type.

impl Hash for Conflict

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 Conflict

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

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

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

impl Eq for Conflict

impl StructuralPartialEq for Conflict