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