Enum NoteMergeStrategy 

pub enum NoteMergeStrategy {
    Manual,
    Ours,
    Theirs,
    Union,
    CatSortUniq,
}

How git notes merge resolves a conflict. Magit offers the same set, which is git’s own.

Variants

Manual

Stop and leave the conflict for the user to resolve, then --commit or --abort. Git’s default.

Ours

Theirs

Union

CatSortUniq

Implementations

impl NoteMergeStrategy

pub fn as_str(self) -> &'static str

The --strategy= value git expects.

pub fn parse(s: &str) -> Option<Self>

Parse the name a user typed. None for anything else — the caller says so rather than silently falling back to manual, which would resolve a merge differently from what was asked.

Trait Implementations

impl Clone for NoteMergeStrategy

fn clone(&self) -> NoteMergeStrategy

Returns a duplicate of the value.

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

Performs copy-assignment from source.

impl Copy for NoteMergeStrategy

impl Debug for NoteMergeStrategy

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

Formats the value using the given formatter.

impl Eq for NoteMergeStrategy

impl PartialEq for NoteMergeStrategy

fn eq(&self, other: &NoteMergeStrategy) -> bool

Equality operator ==.

fn ne(&self, other: &Rhs) -> bool

Inequality operator !=.

impl StructuralPartialEq for NoteMergeStrategy