Enum git_workarea::Conflict
[−]
[src]
pub enum Conflict { Path(PathBuf), SubmoduleNotMerged(PathBuf), SubmoduleNotPresent(PathBuf), SubmoduleWithFix(PathBuf, CommitId), }
Representation of merge conflict possibilities.
Variants
Path(PathBuf)
A regular blob has conflicted.
SubmoduleNotMerged(PathBuf)
A submodule points to a commit not merged into the target branch.
SubmoduleNotPresent(PathBuf)
The submodule points to a commit not present in the main repository.
SubmoduleWithFix(PathBuf, CommitId)
The submodule conflicts, but a resolution is available.
This occurs when the submodule points to a commit not on the first-parent history of the target branch on both sides of the merge. The suggested commit is the oldest commit on the main branch which contains both branches.