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

Derived Implementations

impl Clone for FileFavor

fn clone(&self) -> FileFavor

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

impl Copy for FileFavor

impl Debug for FileFavor

fn fmt(&self, __arg_0: &mut Formatter) -> Result

impl Eq for FileFavor

impl PartialEq for FileFavor

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

fn ne(&self, __arg_0: &FileFavor) -> bool