[−][src]Enum git_workarea::Conflict
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.
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
impl Conflict
[src]
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
impl<T> Any for T where
T: 'static + ?Sized,
[src]
T: 'static + ?Sized,
impl<T> Borrow<T> for T where
T: ?Sized,
[src]
T: ?Sized,
impl<T> BorrowMut<T> for T where
T: ?Sized,
[src]
T: ?Sized,
fn borrow_mut(&mut self) -> &mut T
[src]
impl<T> From<T> for T
[src]
impl<T, U> Into<U> for T where
U: From<T>,
[src]
U: From<T>,
impl<T, U> TryFrom<U> for T where
U: Into<T>,
[src]
U: Into<T>,
type Error = Infallible
The type returned in the event of a conversion error.
fn try_from(value: U) -> Result<T, <T as TryFrom<U>>::Error>
[src]
impl<T, U> TryInto<U> for T where
U: TryFrom<T>,
[src]
U: TryFrom<T>,