Enum MergeStrategy 

pub enum MergeStrategy {
    Auto,
    Ours,
    Theirs,
}

Strategy passed to merge_branch.

Variants

Auto

Compute diffs and auto-merge where safe; report conflicts otherwise.

Ours

Prefer ours on all conflicts. Always produces a Clean result.

Theirs

Prefer theirs on all conflicts. Always produces a Clean result.

Trait Implementations

impl Clone for MergeStrategy

fn clone(&self) -> MergeStrategy

Returns a duplicate of the value.

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

Performs copy-assignment from source.

impl Debug for MergeStrategy

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

Formats the value using the given formatter.

impl Default for MergeStrategy

fn default() -> MergeStrategy

Returns the “default value” for a type.

impl<'de> Deserialize<'de> for MergeStrategy

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

where __D: Deserializer<'de>,

Deserialize this value from the given Serde deserializer.

impl PartialEq for MergeStrategy

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

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 MergeStrategy

impl Eq for MergeStrategy

impl StructuralPartialEq for MergeStrategy