Enum git_workarea::Conflict
source · pub enum Conflict {
Path(PathBuf),
SubmoduleNotMerged(PathBuf),
SubmoduleNotPresent(PathBuf),
SubmoduleWithFix(PathBuf, CommitId),
}
Expand description
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.
Implementations§
Trait Implementations§
Auto Trait Implementations§
impl RefUnwindSafe for Conflict
impl Send for Conflict
impl Sync for Conflict
impl Unpin for Conflict
impl UnwindSafe for Conflict
Blanket Implementations§
source§impl<T> BorrowMut<T> for Twhere
T: ?Sized,
impl<T> BorrowMut<T> for Twhere T: ?Sized,
source§fn borrow_mut(&mut self) -> &mut T
fn borrow_mut(&mut self) -> &mut T
Mutably borrows from an owned value. Read more