pub enum ConflictKind {
BothModified,
ModifiedDeleted,
DeletedModified,
BothAdded,
}Expand description
The shape of a disagreement.
Named from the destination’s point of view first, so ModifiedDeleted reads
“ours modified, theirs deleted”.
Variants§
BothModified
Both sides changed an existing document, to different values.
ModifiedDeleted
The destination changed it; the branch deleted it.
DeletedModified
The destination deleted it; the branch changed it.
BothAdded
It did not exist at the fork point and both sides created it, differently.
Trait Implementations§
Source§impl Clone for ConflictKind
impl Clone for ConflictKind
Source§fn clone(&self) -> ConflictKind
fn clone(&self) -> ConflictKind
Returns a duplicate of the value. Read more
1.0.0 (const: unstable) · Source§fn clone_from(&mut self, source: &Self)
fn clone_from(&mut self, source: &Self)
Performs copy-assignment from
source. Read moreimpl Copy for ConflictKind
Source§impl Debug for ConflictKind
impl Debug for ConflictKind
Source§impl<'de> Deserialize<'de> for ConflictKind
impl<'de> Deserialize<'de> for ConflictKind
Source§fn deserialize<__D>(
__deserializer: __D,
) -> Result<ConflictKind, <__D as Deserializer<'de>>::Error>where
__D: Deserializer<'de>,
fn deserialize<__D>(
__deserializer: __D,
) -> Result<ConflictKind, <__D as Deserializer<'de>>::Error>where
__D: Deserializer<'de>,
Deserialize this value from the given Serde deserializer. Read more
impl Eq for ConflictKind
Source§impl PartialEq for ConflictKind
impl PartialEq for ConflictKind
Source§impl Serialize for ConflictKind
impl Serialize for ConflictKind
Source§fn serialize<__S>(
&self,
__serializer: __S,
) -> Result<<__S as Serializer>::Ok, <__S as Serializer>::Error>where
__S: Serializer,
fn serialize<__S>(
&self,
__serializer: __S,
) -> Result<<__S as Serializer>::Ok, <__S as Serializer>::Error>where
__S: Serializer,
Serialize this value into the given Serde serializer. Read more
impl StructuralPartialEq for ConflictKind
Auto Trait Implementations§
impl Freeze for ConflictKind
impl RefUnwindSafe for ConflictKind
impl Send for ConflictKind
impl Sync for ConflictKind
impl Unpin for ConflictKind
impl UnsafeUnpin for ConflictKind
impl UnwindSafe for ConflictKind
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,
impl<T> DeserializeOwned for Twhere
T: for<'de> Deserialize<'de>,
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§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.impl<A, B, T> HttpServerConnExec<A, B> for Twhere
B: Body,
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 more