Enum NotesMergeOutcome 

pub enum NotesMergeOutcome {
    AlreadyUpToDate {
        result: ObjectId,
    },
    FastForward {
        result: ObjectId,
    },
    Merged {
        result: ObjectId,
    },
    Conflicted {
        partial: ObjectId,
        conflicts: Vec<NotesMergeConflict>,
    },
}

Result of merging one notes ref into another.

Variants

AlreadyUpToDate

The local ref was already up to date.

Fields

result: ObjectId

FastForward

The merge fast-forwarded to the remote notes commit.

Fields

result: ObjectId

Merged

A merge commit was created and the local ref advanced to it.

Fields

result: ObjectId

Conflicted

A partial merge commit was created; conflicts must be resolved by the caller.

Fields

partial: ObjectId

conflicts: Vec<NotesMergeConflict>

Trait Implementations

impl Clone for NotesMergeOutcome

fn clone(&self) -> NotesMergeOutcome

Returns a duplicate of the value.

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

Performs copy-assignment from source.

impl Debug for NotesMergeOutcome

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

Formats the value using the given formatter.

impl Eq for NotesMergeOutcome

impl PartialEq for NotesMergeOutcome

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