Enum ConflictChoice 

pub enum ConflictChoice {
    KeepLocal,
    UseRepo,
    Merge,
    Skip,
    ShowDiff,
}

The user’s response to a conflict resolution prompt.

Variants

KeepLocal

Keep the local (actual) file — pull it into the repo.

UseRepo

Use the repo version — push to actual (local file will be backed up).

Merge

Attempt an automatic 3-way merge (only for plain-text files).

Skip

Skip this entry for now; leave both sides unchanged.

ShowDiff

Show a diff between repo and actual before deciding.

Trait Implementations

impl Clone for ConflictChoice

fn clone(&self) -> ConflictChoice

Returns a duplicate of the value.

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

Performs copy-assignment from source.

impl Copy for ConflictChoice

impl Debug for ConflictChoice

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

Formats the value using the given formatter.

impl Eq for ConflictChoice

impl PartialEq for ConflictChoice

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