Enum ConflictResolutionMode 

pub enum ConflictResolutionMode {
    Ours,
    Theirs,
    Edit,
    Auto,
}

How a conflict was resolved.

The three manual variants preserve the explicit operator choice. Auto means the rebase merge driver resolved overlapping changes mechanically, without a human or agent editing or selecting a side.

Variants

Ours

Theirs

Edit

Auto

Implementations

impl ConflictResolutionMode

pub fn as_str(self) -> &'static str

Stable lower-case spelling used in persisted resolution summaries and human-facing oplog descriptions.

Trait Implementations

impl Clone for ConflictResolutionMode

fn clone(&self) -> ConflictResolutionMode

Returns a duplicate of the value.

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

Performs copy-assignment from source.

impl Copy for ConflictResolutionMode

impl Debug for ConflictResolutionMode

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

Formats the value using the given formatter.

impl<'de> Deserialize<'de> for ConflictResolutionMode

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

where __D: Deserializer<'de>,

Deserialize this value from the given Serde deserializer.

impl Eq for ConflictResolutionMode

impl PartialEq for ConflictResolutionMode

fn eq(&self, other: &ConflictResolutionMode) -> bool

Equality operator ==.

fn ne(&self, other: &Rhs) -> bool

Inequality operator !=.

impl Serialize for ConflictResolutionMode

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 ConflictResolutionMode