pub enum ResolutionStrategy {
KeepLocal,
KeepRemote,
ThreeWayMerge,
KeepBoth,
TakeNewer,
TakeLonger,
CustomMerge,
AutoMerge,
}Expand description
Resolution strategy for conflicts
Variants§
KeepLocal
Keep local version
KeepRemote
Keep remote version
ThreeWayMerge
Attempt three-way merge
KeepBoth
Keep both as separate memories
TakeNewer
Take newer version (by timestamp)
TakeLonger
Take version with more content
CustomMerge
Custom merge provided by user
AutoMerge
Union tags, merge metadata, keep local content
Trait Implementations§
Source§impl Clone for ResolutionStrategy
impl Clone for ResolutionStrategy
Source§fn clone(&self) -> ResolutionStrategy
fn clone(&self) -> ResolutionStrategy
Returns a duplicate of the value. Read more
1.0.0 · Source§fn clone_from(&mut self, source: &Self)
fn clone_from(&mut self, source: &Self)
Performs copy-assignment from
source. Read moreSource§impl Debug for ResolutionStrategy
impl Debug for ResolutionStrategy
Source§impl<'de> Deserialize<'de> for ResolutionStrategy
impl<'de> Deserialize<'de> for ResolutionStrategy
Source§fn deserialize<__D>(__deserializer: __D) -> Result<Self, __D::Error>where
__D: Deserializer<'de>,
fn deserialize<__D>(__deserializer: __D) -> Result<Self, __D::Error>where
__D: Deserializer<'de>,
Deserialize this value from the given Serde deserializer. Read more
Source§impl PartialEq for ResolutionStrategy
impl PartialEq for ResolutionStrategy
Source§impl Serialize for ResolutionStrategy
impl Serialize for ResolutionStrategy
impl Copy for ResolutionStrategy
impl Eq for ResolutionStrategy
impl StructuralPartialEq for ResolutionStrategy
Auto Trait Implementations§
impl Freeze for ResolutionStrategy
impl RefUnwindSafe for ResolutionStrategy
impl Send for ResolutionStrategy
impl Sync for ResolutionStrategy
impl Unpin for ResolutionStrategy
impl UnsafeUnpin for ResolutionStrategy
impl UnwindSafe for ResolutionStrategy
Blanket Implementations§
Source§impl<T> BorrowMut<T> for Twhere
T: ?Sized,
impl<T> BorrowMut<T> for Twhere
T: ?Sized,
Source§fn borrow_mut(&mut self) -> &mut T
fn borrow_mut(&mut self) -> &mut T
Mutably borrows from an owned value. Read more
Source§impl<T> CloneToUninit for Twhere
T: Clone,
impl<T> CloneToUninit for Twhere
T: Clone,
Source§impl<Q, K> Equivalent<K> for Q
impl<Q, K> Equivalent<K> for Q
Source§impl<Q, K> Equivalent<K> for Q
impl<Q, K> Equivalent<K> for Q
Source§fn equivalent(&self, key: &K) -> bool
fn equivalent(&self, key: &K) -> bool
Compare self to
key and return true if they are equal.Source§impl<T> Instrument for T
impl<T> Instrument for T
Source§fn instrument(self, span: Span) -> Instrumented<Self>
fn instrument(self, span: Span) -> Instrumented<Self>
Source§fn in_current_span(self) -> Instrumented<Self>
fn in_current_span(self) -> Instrumented<Self>
Source§impl<T> IntoEither for T
impl<T> IntoEither for T
Source§fn into_either(self, into_left: bool) -> Either<Self, Self>
fn into_either(self, into_left: bool) -> Either<Self, Self>
Converts
self into a Left variant of Either<Self, Self>
if into_left is true.
Converts self into a Right variant of Either<Self, Self>
otherwise. Read moreSource§fn into_either_with<F>(self, into_left: F) -> Either<Self, Self>
fn into_either_with<F>(self, into_left: F) -> Either<Self, Self>
Converts
self into a Left variant of Either<Self, Self>
if into_left(&self) returns true.
Converts self into a Right variant of Either<Self, Self>
otherwise. Read moreCreates a shared type from an unshared type.