Enum Resolution 

pub enum Resolution {
    UseBase,
    UseIncoming,
    KeepBoth,
    SkipBoth,
    RenameIncoming {
        new_path: PathBuf,
    },
}

Resolution decision for a conflict

Variants

UseBase

Use the base (local) operation

UseIncoming

Use the incoming (remote) operation

KeepBoth

Keep both operations (fork state)

SkipBoth

Skip both operations (neither is applied)

RenameIncoming

Rename the incoming operation to a new path (creates a conflict file)

Fields

new_path: PathBuf

The new path for the incoming operation

Trait Implementations

impl Clone for Resolution

fn clone(&self) -> Resolution

Returns a duplicate of the value.

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

Performs copy-assignment from source.

impl Debug for Resolution

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

Formats the value using the given formatter.

impl PartialEq for Resolution

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

impl StructuralPartialEq for Resolution