Enum git2::FileFavor

pub enum FileFavor {
    Normal,
    Ours,
    Theirs,
    Union,
}

Merge file favor options for MergeOptions instruct the file-level merging functionality how to deal with conflicting regions of the files.

Variants

Normal

When a region of a file is changed in both branches, a conflict will be recorded in the index so that git_checkout can produce a merge file with conflict markers in the working directory. This is the default.

Ours

When a region of a file is changed in both branches, the file created in the index will contain the “ours” side of any conflicting region. The index will not record a conflict.

Theirs

When a region of a file is changed in both branches, the file created in the index will contain the “theirs” side of any conflicting region. The index will not record a conflict.

Union

When a region of a file is changed in both branches, the file created in the index will contain each unique line from each side, which has the result of combining both files. The index will not record a conflict.

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 PartialEq for FileFavor

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

This method tests for self and other values to be equal, and is used by ==.

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

This method tests for !=. The default implementation is almost always sufficient, and should not be overridden without very good reason.

impl Copy for FileFavor

impl Eq for FileFavor

impl StructuralPartialEq for FileFavor