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.
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.
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.
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.
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.
This method tests for self
and other
values to be equal, and is used by ==
. Read more
This method tests for !=
.
Performs copy-assignment from source
. Read more
Formats the value using the given formatter. Read more
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
🔬 This is a nightly-only experimental API. (try_from
)
The type returned in the event of a conversion error.
🔬 This is a nightly-only experimental API. (try_from
)
Immutably borrows from an owned value. Read more
Mutably borrows from an owned value. Read more
🔬 This is a nightly-only experimental API. (try_from
)
The type returned in the event of a conversion error.
🔬 This is a nightly-only experimental API. (try_from
)
🔬 This is a nightly-only experimental API. (get_type_id
)
this method will likely be replaced by an associated static