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

source

impl Conflict

source

pub fn path(&self) -> &Path

The path to the blob that for the conflict.

Trait Implementations

source

impl Debug for Conflict

source

fn fmt(&self, f: &mut Formatter<'_>) -> Result

Formats the value using the given formatter. Read more

source

impl PartialEq<Conflict> for Conflict

source

fn eq(&self, rhs: &Self) -> bool

This method tests for self and other values to be equal, and is used by ==. Read more

1.0.0 · source

fn ne(&self, other: &Rhs) -> bool

This method tests for !=.

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> Any for T where
T: 'static + ?Sized,

source

pub fn type_id(&self) -> TypeId

Gets the TypeId of self. Read more

source

impl<T> Borrow<T> for T where
T: ?Sized,

const: unstable · source

pub fn borrow(&self) -> &T

Immutably borrows from an owned value. Read more

source

impl<T> BorrowMut<T> for T where
T: ?Sized,

const: unstable · source

pub fn borrow_mut(&mut self) -> &mut T

Mutably borrows from an owned value. Read more

source

impl<T> From<T> for T

const: unstable · source

pub fn from(t: T) -> T

Performs the conversion.

source

impl<T, U> Into for T where
U: From<T>,

const: unstable · source

pub fn into(self) -> U

Performs the conversion.

source

impl<T, U> TryFrom for T where
U: Into<T>,

type Error = Infallible

The type returned in the event of a conversion error.

const: unstable · source

pub fn try_from(value: U) -> Result<T, <T as TryFrom>::Error>

Performs the conversion.

source

impl<T, U> TryInto for T where
U: TryFrom<T>,

type Error = >::Error

The type returned in the event of a conversion error.

const: unstable · source

pub fn try_into(self) -> Result<U, >::Error>

Performs the conversion.

Enum git_workarea::Conflict

Variants

`Path(PathBuf)`

`SubmoduleNotMerged(PathBuf)`

`SubmoduleNotPresent(PathBuf)`

`SubmoduleWithFix(PathBuf, CommitId)`

Implementations

impl Conflict

pub fn path(&self) -> &Path

Trait Implementations

impl Debug for Conflict

fn fmt(&self, f: &mut Formatter<'_>) -> Result

impl PartialEq<Conflict> for Conflict

fn eq(&self, rhs: &Self) -> bool

fn ne(&self, other: &Rhs) -> bool

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,

pub fn type_id(&self) -> TypeId

impl<T> Borrow<T> for T where
T: ?Sized,

pub fn borrow(&self) -> &T

impl<T> BorrowMut<T> for T where
T: ?Sized,

pub fn borrow_mut(&mut self) -> &mut T

impl<T> From<T> for T

pub fn from(t: T) -> T

impl<T, U> Into<U> for T where
U: From<T>,

pub fn into(self) -> U

impl<T, U> TryFrom<U> for T where
U: Into<T>,

type Error = Infallible

pub fn try_from(value: U) -> Result<T, <T as TryFrom<U>>::Error>

impl<T, U> TryInto<U> for T where
U: TryFrom<T>,

type Error = <U as TryFrom<T>>::Error

pub fn try_into(self) -> Result<U, <U as TryFrom<T>>::Error>

Enum git_workarea::Conflict

Variants

Path(PathBuf)

SubmoduleNotMerged(PathBuf)

SubmoduleNotPresent(PathBuf)

SubmoduleWithFix(PathBuf, CommitId)

Implementations

impl Conflict

pub fn path(&self) -> &Path

Trait Implementations

impl Debug for Conflict

fn fmt(&self, f: &mut Formatter<'_>) -> Result

impl PartialEq<Conflict> for Conflict

fn eq(&self, rhs: &Self) -> bool

fn ne(&self, other: &Rhs) -> bool

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,

pub fn type_id(&self) -> TypeId

impl<T> Borrow<T> for T where T: ?Sized,

pub fn borrow(&self) -> &T

impl<T> BorrowMut<T> for T where T: ?Sized,

pub fn borrow_mut(&mut self) -> &mut T

impl<T> From<T> for T

pub fn from(t: T) -> T

impl<T, U> Into<U> for T where U: From<T>,

pub fn into(self) -> U

impl<T, U> TryFrom<U> for T where U: Into<T>,

type Error = Infallible

pub fn try_from(value: U) -> Result<T, <T as TryFrom<U>>::Error>

impl<T, U> TryInto<U> for T where U: TryFrom<T>,

type Error = <U as TryFrom<T>>::Error

pub fn try_into(self) -> Result<U, <U as TryFrom<T>>::Error>

`Path(PathBuf)`

`SubmoduleNotMerged(PathBuf)`

`SubmoduleNotPresent(PathBuf)`

`SubmoduleWithFix(PathBuf, CommitId)`

impl<T> Any for T where
T: 'static + ?Sized,

impl<T> Borrow<T> for T where
T: ?Sized,

impl<T> BorrowMut<T> for T where
T: ?Sized,

impl<T, U> Into<U> for T where
U: From<T>,

impl<T, U> TryFrom<U> for T where
U: Into<T>,

impl<T, U> TryInto<U> for T where
U: TryFrom<T>,