Struct git2::IndexConflict

source · 
pub struct IndexConflict {
    pub ancestor: Option<IndexEntry>,
    pub our: Option<IndexEntry>,
    pub their: Option<IndexEntry>,
}
Expand description

A structure to represent the information returned when a conflict is detected in an index entry

Fields§

§ancestor: Option<IndexEntry>

The ancestor index entry of the two conflicting index entries

§our: Option<IndexEntry>

The index entry originating from the user’s copy of the repository. Its contents conflict with ‘their’ index entry

§their: Option<IndexEntry>

The index entry originating from the external repository. Its contents conflict with ‘our’ index entry

Auto Trait Implementations§

Blanket Implementations§

source§

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

source§

fn type_id(&self) -> TypeId

Gets the TypeId of self. Read more
source§

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

source§

fn borrow(&self) -> &T

Immutably borrows from an owned value. Read more
source§

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

source§

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

Mutably borrows from an owned value. Read more
source§

impl<T> From<T> for T

source§

fn from(t: T) -> T

Returns the argument unchanged.

source§

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

source§

fn into(self) -> U

Calls U::from(self).

That is, this conversion is whatever the implementation of From<T> for U chooses to do.

source§

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

§

type Error = Infallible

The type returned in the event of a conversion error.
source§

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

Performs the conversion.
source§

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

§

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

The type returned in the event of a conversion error.
source§

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

Performs the conversion.