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.