pub enum MergeOutcome {
Empty,
Applied {
files: usize,
},
Conflicted {
patch: PathBuf,
reason: String,
},
}Expand description
What happened when a child’s work was applied to the project.
Variants§
Empty
The child changed nothing.
Applied
Applied cleanly. files is how many paths the patch touched.
Conflicted
The patch would not apply to the project as it now stands — most likely another agent (or the user) touched the same lines. The project is untouched: the patch is saved for inspection and the worktree is kept so the work is recoverable.
Trait Implementations§
Auto Trait Implementations§
impl Freeze for MergeOutcome
impl RefUnwindSafe for MergeOutcome
impl Send for MergeOutcome
impl Sync for MergeOutcome
impl Unpin for MergeOutcome
impl UnsafeUnpin for MergeOutcome
impl UnwindSafe for MergeOutcome
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