Enum ConflictType

pub enum ConflictType {
    Whitespace,
    LineEnding,
    PureAddition,
    ImportMerge,
    Structural,
    ContentOverlap,
    Complex,
}

Type of conflict detected

Variants

Whitespace

Only whitespace or formatting differences

LineEnding

Only line ending differences (CRLF vs LF)

PureAddition

Both sides added lines without overlapping changes

ImportMerge

Import/dependency statements that can be merged

Structural

Code structure changes (functions, classes, etc.)

ContentOverlap

Content changes that overlap

Complex

Complex conflicts requiring manual resolution

Trait Implementations

impl Clone for ConflictType

fn clone(&self) -> ConflictType

Returns a duplicate of the value.

fn clone_from(&mut self, source: &Self)

Performs copy-assignment from source.

impl Debug for ConflictType

fn fmt(&self, f: &mut Formatter<'_>) -> Result

Formats the value using the given formatter.

impl<'de> Deserialize<'de> for ConflictType

fn deserialize<__D>(__deserializer: __D) -> Result<Self, __D::Error>

where __D: Deserializer<'de>,

Deserialize this value from the given Serde deserializer.

impl Hash for ConflictType

fn hash<__H: Hasher>(&self, state: &mut __H)

Feeds this value into the given Hasher.

fn hash_slice<H>(data: &[Self], state: &mut H)

where H: Hasher, Self: Sized,

Feeds a slice of this type into the given Hasher.

impl PartialEq for ConflictType

fn eq(&self, other: &ConflictType) -> bool

Tests for self and other values to be equal, and is used by ==.

fn ne(&self, other: &Rhs) -> bool

Tests for !=. The default implementation is almost always sufficient, and should not be overridden without very good reason.

impl Serialize for ConflictType

fn serialize<__S>(&self, __serializer: __S) -> Result<__S::Ok, __S::Error>

where __S: Serializer,

Serialize this value into the given Serde serializer.

impl Eq for ConflictType

impl StructuralPartialEq for ConflictType