Enum NotesMergeStrategy 

pub enum NotesMergeStrategy {
    Ours,
    Theirs,
    Union,
}

Merge strategy for conflicting notes on the same commit.

Variants

Ours

Keep local version on conflict.

Theirs

Keep remote version on conflict.

Union

JSON-level merge of annotation content (default).

Trait Implementations

impl Clone for NotesMergeStrategy

fn clone(&self) -> NotesMergeStrategy

Returns a duplicate of the value.

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

Performs copy-assignment from source.

impl Debug for NotesMergeStrategy

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

Formats the value using the given formatter.

impl Display for NotesMergeStrategy

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

Formats the value using the given formatter.

impl FromStr for NotesMergeStrategy

type Err = String

The associated error which can be returned from parsing.

fn from_str(s: &str) -> Result<Self, Self::Err>

Parses a string s to return a value of this type.

impl PartialEq for NotesMergeStrategy

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

impl Eq for NotesMergeStrategy

impl StructuralPartialEq for NotesMergeStrategy