[go: up one dir, main page]

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§

Gets the TypeId of self. Read more
Immutably borrows from an owned value. Read more
Mutably borrows from an owned value. Read more

Returns the argument unchanged.

Calls U::from(self).

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

The type returned in the event of a conversion error.
Performs the conversion.
The type returned in the event of a conversion error.
Performs the conversion.