pub enum ConflictClass {
AutoResolvable,
DriverResolvable,
Genuine,
Structural,
}Expand description
Classification of a conflict’s severity and resolvability.
Per THM-CONFCLASS-001 (YP-ALGEBRA-PATCH-001): Conflict classification determines the merge strategy:
- Type I: Auto-resolve (identical changes)
- Type II: Attempt driver merge
- Type III: Human intervention required
- Type IV: Structural restructuring (highest complexity)
Variants§
AutoResolvable
Both sides made the identical change — auto-resolvable.
DriverResolvable
Both changed different aspects of the same element — may be driver-resolvable.
Genuine
Both changed the same element differently — genuine conflict.
Structural
One side restructured, other modified — structural conflict.
Trait Implementations§
Source§impl Clone for ConflictClass
impl Clone for ConflictClass
Source§fn clone(&self) -> ConflictClass
fn clone(&self) -> ConflictClass
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 ConflictClass
impl Debug for ConflictClass
Source§impl<'de> Deserialize<'de> for ConflictClass
impl<'de> Deserialize<'de> for ConflictClass
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 ConflictClass
impl PartialEq for ConflictClass
Source§impl Serialize for ConflictClass
impl Serialize for ConflictClass
impl Eq for ConflictClass
impl StructuralPartialEq for ConflictClass
Auto Trait Implementations§
impl Freeze for ConflictClass
impl RefUnwindSafe for ConflictClass
impl Send for ConflictClass
impl Sync for ConflictClass
impl Unpin for ConflictClass
impl UnsafeUnpin for ConflictClass
impl UnwindSafe for ConflictClass
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 more