Enum FileFavor

pub enum FileFavor {
    Ours,
    Theirs,
}

Available on crate feature merge only.

Identify how files should be resolved in case of conflicts.

This works for…

• content merges
• binary files
• symlinks (a form of file after all)

Note that that union merges aren’t available as they aren’t available for binaries or symlinks.

Variants

Ours

Choose our side in case of a conflict. Note that this choice is precise, so ours hunk will only be chosen if they conflict with theirs, so their hunks may still show up in the merged result.

Theirs

Choose their side in case of a conflict. Note that this choice is precise, so ours hunk will only be chosen if they conflict with theirs, so their hunks may still show up in the merged result.

Trait Implementations

impl Clone for FileFavor

fn clone(&self) -> FileFavor

Returns a copy of the value.

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

Performs copy-assignment from source.

impl Debug for FileFavor

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

Formats the value using the given formatter.

impl Copy for FileFavor