Enum ConflictResolution 

pub enum ConflictResolution {
    NewerWins,
    SourceWins,
    TargetWins,
    Manual,
}

Strategy for resolving conflicts when both sides differ.

Variants

NewerWins

Prefer the newer file based on modification time.

SourceWins

Prefer the local/source copy.

TargetWins

Prefer the remote/target copy.

Manual

Require manual resolution.

Trait Implementations

impl Clone for ConflictResolution

fn clone(&self) -> ConflictResolution

Returns a duplicate of the value.

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

Performs copy-assignment from source.

impl Debug for ConflictResolution

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

Formats the value using the given formatter.

impl Default for ConflictResolution

fn default() -> ConflictResolution

Returns the “default value” for a type.

impl<'de> Deserialize<'de> for ConflictResolution

fn deserialize<__D>( __deserializer: __D, ) -> Result<ConflictResolution, <__D as Deserializer<'de>>::Error>

where __D: Deserializer<'de>,

Deserialize this value from the given Serde deserializer.

impl PartialEq for ConflictResolution

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

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

where __S: Serializer,

Serialize this value into the given Serde serializer.

impl Copy for ConflictResolution

impl Eq for ConflictResolution

impl StructuralPartialEq for ConflictResolution