pub struct MergeConflict {
pub path: String,
pub description: String,
pub our_change: String,
pub their_change: String,
}Expand description
A conflict where two branches modified the same AST node incompatibly.
Fields§
§path: String§description: String§our_change: String§their_change: StringTrait Implementations§
Source§impl Clone for MergeConflict
impl Clone for MergeConflict
Source§impl Debug for MergeConflict
impl Debug for MergeConflict
Source§impl PartialEq for MergeConflict
impl PartialEq for MergeConflict
impl StructuralPartialEq for MergeConflict
Auto Trait Implementations§
impl Freeze for MergeConflict
impl RefUnwindSafe for MergeConflict
impl Send for MergeConflict
impl Sync for MergeConflict
impl Unpin for MergeConflict
impl UnsafeUnpin for MergeConflict
impl UnwindSafe for MergeConflict
Blanket Implementations§
Source§impl<T> BorrowMut<T> for Twhere
T: ?Sized,
impl<T> BorrowMut<T> for Twhere
T: ?Sized,
Source§fn borrow_mut(&mut self) -> &mut T
fn borrow_mut(&mut self) -> &mut T
Mutably borrows from an owned value. Read more