Struct NotesMergeConflict 

pub struct NotesMergeConflict {
    pub annotated: ObjectId,
    pub base: Option<ObjectId>,
    pub local: Option<ObjectId>,
    pub remote: Option<ObjectId>,
}

One unresolved note-level conflict from a notes merge.

Fields

annotated: ObjectId

base: Option<ObjectId>

local: Option<ObjectId>

remote: Option<ObjectId>

Trait Implementations

impl Clone for NotesMergeConflict

fn clone(&self) -> NotesMergeConflict

Returns a duplicate of the value.

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

Performs copy-assignment from source.

impl Debug for NotesMergeConflict

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

Formats the value using the given formatter.

impl Eq for NotesMergeConflict

impl PartialEq for NotesMergeConflict

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