Enum Resolution 

pub enum Resolution {
    Value(Vec<u8>),
    Delete,
    Unresolved,
}

Resolution for a standard three-way merge conflict.

Value keeps the key with the provided value, Delete removes the key, and Unresolved returns Error::Conflict to the caller.

Variants

Value(Vec<u8>)

Keep the key with this value.

Delete

Delete the key from the merged tree.

Unresolved

Leave the conflict unresolved.

Implementations

impl Resolution

pub fn value(value: impl Into<Vec<u8>>) -> Self

Resolve the conflict to a concrete value.

pub fn delete() -> Self

Resolve the conflict by deleting the key.

pub fn unresolved() -> Self

Leave the conflict unresolved.

Trait Implementations

impl Clone for Resolution

fn clone(&self) -> Resolution

Returns a duplicate of the value.

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

Performs copy-assignment from source.

impl Debug for Resolution

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

Formats the value using the given formatter.

impl Eq for Resolution

impl From<&Resolution> for MergeResolutionKind

fn from(resolution: &Resolution) -> Self

Converts to this type from the input type.

impl PartialEq for Resolution

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

Equality operator ==.

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

Inequality operator !=.

impl StructuralPartialEq for Resolution