Enum git2::FileFavor[][src]

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

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

Returns a copy of the value. Read more

Performs copy-assignment from source. Read more

Formats the value using the given formatter. Read more

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

This method tests for !=.

Auto Trait Implementations

Blanket Implementations

Gets the TypeId of self. Read more

Immutably borrows from an owned value. Read more

Mutably borrows from an owned value. Read more

Performs the conversion.

Performs the conversion.

The resulting type after obtaining ownership.

Creates owned data from borrowed data, usually by cloning. Read more

🔬 This is a nightly-only experimental API. (toowned_clone_into)

recently added

Uses borrowed data to replace owned data, usually by cloning. Read more

The type returned in the event of a conversion error.

Performs the conversion.

The type returned in the event of a conversion error.

Performs the conversion.