Skip to main content

MergeStrategy

arrow_graph_git::merge

Enum MergeStrategy 

Source 
pub enum MergeStrategy {
    Manual,
    Ours,
    Theirs,
    LastWriterWins,
    Custom(Box<dyn Fn(&Conflict) -> Resolution>),
}
Expand description

Strategy for automatic conflict resolution during merge.

Variants§

§

Manual

Default: return MergeResult::Conflict for manual resolution.

§

Ours

Keep branch A’s value for all conflicts.

§

Theirs

Keep branch B’s value for all conflicts.

§

LastWriterWins

Compare timestamps, keep the newer value.

§

Custom(Box<dyn Fn(&Conflict) -> Resolution>)

Caller-defined logic: receives a &Conflict and returns a Resolution.

Auto Trait Implementations§

Blanket Implementations§

Source§

impl<T> Any for T
where T: 'static + ?Sized,

Source§

fn type_id(&self) -> TypeId

Gets the TypeId of self. Read more
Source§

impl<T> Borrow<T> for T
where T: ?Sized,

Source§

fn borrow(&self) -> &T

Immutably borrows from an owned value. Read more
Source§

impl<T> BorrowMut<T> for T
where T: ?Sized,

Source§

fn borrow_mut(&mut self) -> &mut T

Mutably borrows from an owned value. Read more
Source§

impl<T> From<T> for T

Source§

fn from(t: T) -> T

Returns the argument unchanged.

Source§

impl<T, U> Into<U> for T
where U: From<T>,

Source§

fn into(self) -> U

Calls U::from(self).

That is, this conversion is whatever the implementation of From<T> for U chooses to do.

Source§

impl<T, U> TryFrom<U> for T
where U: Into<T>,

Source§

type Error = Infallible

The type returned in the event of a conversion error.
Source§

fn try_from(value: U) -> Result<T, <T as TryFrom<U>>::Error>

Performs the conversion.
Source§

impl<T, U> TryInto<U> for T
where U: TryFrom<T>,

Source§

type Error = <U as TryFrom<T>>::Error

The type returned in the event of a conversion error.
Source§

fn try_into(self) -> Result<U, <U as TryFrom<T>>::Error>

Performs the conversion.