pub enum ConflictReason {
DivergentAdd,
DivergentModify,
ModifyDelete,
RenameConflict,
DivergentRename,
Incompatible,
}Expand description
Why two PatchValues on the same path could not be merged.
Variants§
DivergentAdd
Both sides add a file but with different content or file identity.
DivergentModify
Both sides modify a file but produce different new blobs.
ModifyDelete
One side modifies the file, the other deletes it.
RenameConflict
One side renames, the other modifies in a way that conflicts.
DivergentRename
Both sides rename the same file to different destinations.
Incompatible
General incompatibility (different operation types on the same path).
Trait Implementations§
Source§impl Clone for ConflictReason
impl Clone for ConflictReason
Source§fn clone(&self) -> ConflictReason
fn clone(&self) -> ConflictReason
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 ConflictReason
impl Debug for ConflictReason
Source§impl<'de> Deserialize<'de> for ConflictReason
impl<'de> Deserialize<'de> for ConflictReason
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 Display for ConflictReason
impl Display for ConflictReason
Source§impl PartialEq for ConflictReason
impl PartialEq for ConflictReason
Source§impl Serialize for ConflictReason
impl Serialize for ConflictReason
impl Eq for ConflictReason
impl StructuralPartialEq for ConflictReason
Auto Trait Implementations§
impl Freeze for ConflictReason
impl RefUnwindSafe for ConflictReason
impl Send for ConflictReason
impl Sync for ConflictReason
impl Unpin for ConflictReason
impl UnsafeUnpin for ConflictReason
impl UnwindSafe for ConflictReason
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.