Enum TextConflictChoice 

pub enum TextConflictChoice {
    Postpone,
    Base,
    TheirsFull,
    MineFull,
    TheirsConflict,
    MineConflict,
    Merged,
    Unspecified,
}

Conflict resolution choice for text and property conflicts

Variants

Postpone

Postpone resolution for later

Base

Use base version (original)

TheirsFull

Use their version (incoming changes)

MineFull

Use my version (local changes)

TheirsConflict

Use their version for conflicts only

MineConflict

Use my version for conflicts only

Merged

Use a merged version

Unspecified

Undefined/unspecified

Trait Implementations

impl Clone for TextConflictChoice

fn clone(&self) -> TextConflictChoice

Returns a duplicate of the value.

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

Performs copy-assignment from source.

impl Debug for TextConflictChoice

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

Formats the value using the given formatter.

impl From<TextConflictChoice> for svn_client_conflict_option_id_t

Available on crate feature client only.

fn from(choice: TextConflictChoice) -> Self

Converts to this type from the input type.

impl PartialEq for TextConflictChoice

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

impl Eq for TextConflictChoice

impl StructuralPartialEq for TextConflictChoice