Enum TreeFavor 

pub enum TreeFavor {
    Ours,
    Ancestor,
}

Available on crate feature merge only.

Control how irreconcilable changes to trees should be resolved.

Examples for such issues are:

• we: delete, they: modify
• we: rename, they: rename to something else
• we: delete, they: rename

Use this to control which entries are visible to in the resulting tree. Also note that this does not apply to the many tree-related changes are reconcilable.

Variants

Ours

Choose our side in case of a conflict. Note that content-merges are still performed according to the FileFavor.

Ancestor

Choose the state of the shared common ancestor, dropping both ours and their changes. Content merges are not performed here.

Trait Implementations

impl Clone for TreeFavor

fn clone(&self) -> TreeFavor

Returns a duplicate of the value.

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

Performs copy-assignment from source.

impl Debug for TreeFavor

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

Formats the value using the given formatter.

impl From<TreeFavor> for ResolveWith

fn from(value: TreeFavor) -> Self

Converts to this type from the input type.

impl Copy for TreeFavor