Enum ResolutionStrategy 

pub enum ResolutionStrategy {
    TakeOurs,
    TakeTheirs,
    Merge,
    Custom(String),
    Manual,
}

Strategy for resolving a conflict

Variants

TakeOurs

Use “our” version

TakeTheirs

Use “their” version

Merge

Merge both versions

Custom(String)

Apply custom resolution logic

Manual

Cannot be automatically resolved

Trait Implementations

impl Clone for ResolutionStrategy

fn clone(&self) -> ResolutionStrategy

Returns a duplicate of the value.

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

Performs copy-assignment from source.

impl Debug for ResolutionStrategy

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

Formats the value using the given formatter.

impl<'de> Deserialize<'de> for ResolutionStrategy

fn deserialize<__D>(__deserializer: __D) -> Result<Self, __D::Error>

where __D: Deserializer<'de>,

Deserialize this value from the given Serde deserializer.

impl PartialEq for ResolutionStrategy

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

fn serialize<__S>(&self, __serializer: __S) -> Result<__S::Ok, __S::Error>

where __S: Serializer,

Serialize this value into the given Serde serializer.

impl StructuralPartialEq for ResolutionStrategy