Enum ConflictClass 

pub enum ConflictClass {
    TextMarkers,
    Binary,
    DeleteModify,
    Special,
}

Classification of how a conflicting path is presented to the user.

Variants

TextMarkers

Text modify/modify or add/add: classic 2-way Git markers are written into the worktree file.

Binary

Binary blob on either side: no markers (they would corrupt the file); the ours-side content is left in place for manual edit.

DeleteModify

Delete/modify: one side removed the path; the surviving content is left in place; resolve by mkit add or mkit rm.

Special

Symlink or executable-mode change, or any other shape unsafe for markers: ours-side content/mode is left in place for manual edit.

Trait Implementations

impl Clone for ConflictClass

fn clone(&self) -> ConflictClass

Returns a duplicate of the value.

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

Performs copy-assignment from source.

impl Copy for ConflictClass

impl Debug for ConflictClass

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

Formats the value using the given formatter.

impl Eq for ConflictClass

impl PartialEq for ConflictClass

fn eq(&self, other: &ConflictClass) -> 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 StructuralPartialEq for ConflictClass