[go: up one dir, main page]

Struct git2::IndexConflict[−][src]

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

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

pub fn type_id(&self) -> TypeId[src]

Gets the TypeId of self. Read more

impl<T> Borrow<T> for T where
    T: ?Sized, [src]

pub fn borrow(&self) -> &T[src]

Immutably borrows from an owned value. Read more

impl<T> BorrowMut<T> for T where
    T: ?Sized, [src]

pub fn borrow_mut(&mut self) -> &mut T[src]

Mutably borrows from an owned value. Read more

impl<T> From<T> for T[src]

pub fn from(t: T) -> T[src]

Performs the conversion.

impl<T, U> Into<U> for T where
    U: From<T>, [src]

pub fn into(self) -> U[src]

Performs the conversion.

impl<T, U> TryFrom<U> for T where
    U: Into<T>, [src]

type Error = Infallible

The type returned in the event of a conversion error.

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

Performs the conversion.

impl<T, U> TryInto<U> for T where
    U: TryFrom<T>, [src]

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

The type returned in the event of a conversion error.

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

Performs the conversion.