Enum ConflictStatus 

pub enum ConflictStatus {
    Unresolved,
    ResolvedA,
    ResolvedB,
    ResolvedManual,
}

The resolution status of a conflict.

Variants

Unresolved

Conflict is unresolved.

ResolvedA

Conflict was resolved by choosing side A.

ResolvedB

Conflict was resolved by choosing side B.

ResolvedManual

Conflict was resolved with a manual merge.

Trait Implementations

impl Clone for ConflictStatus

fn clone(&self) -> ConflictStatus

Returns a duplicate of the value.

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

Performs copy-assignment from source.

impl Debug for ConflictStatus

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

Formats the value using the given formatter.

impl<'de> Deserialize<'de> for ConflictStatus

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

where __D: Deserializer<'de>,

Deserialize this value from the given Serde deserializer.

impl PartialEq for ConflictStatus

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

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

where __S: Serializer,

Serialize this value into the given Serde serializer.

impl Eq for ConflictStatus

impl StructuralPartialEq for ConflictStatus