Enum ConflictResolution 

#[non_exhaustive]
pub enum ConflictResolution {
    KeepA,
    KeepB,
    Merged,
    HigherConfidence,
}

How a merge conflict was resolved.

Variants (Non-exhaustive)

Non-exhaustive enums could have additional variants added in future. Therefore, when matching against variants of non-exhaustive enums, an extra wildcard arm must be added to account for any future variants.

KeepA

Kept the value from model A.

KeepB

Kept the value from model B.

Merged

Merged both values.

HigherConfidence

Used the higher confidence value.

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

Formats the value using the given formatter.

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

fn deserialize<__D>(__deserializer: __D) -> Result<Self, __D::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::Ok, __S::Error>

where __S: Serializer,

Serialize this value into the given Serde serializer.

impl Copy for ConflictResolution

impl Eq for ConflictResolution

impl StructuralPartialEq for ConflictResolution