pub struct MergeResult {
pub merge_commit_id: CommitId,
pub auto_resolved: usize,
pub manual_conflicts: Vec<MemoryConflict>,
pub summary: String,
}Expand description
Result of a semantic merge operation
Fields§
§merge_commit_id: CommitIdThe new merge commit ID
auto_resolved: usizeNumber of automatic resolutions
manual_conflicts: Vec<MemoryConflict>Any conflicts that couldn’t be auto-resolved
summary: StringSummary of the merge
Trait Implementations§
Source§impl Clone for MergeResult
impl Clone for MergeResult
Source§fn clone(&self) -> MergeResult
fn clone(&self) -> MergeResult
Returns a duplicate of the value. Read more
1.0.0 · Source§fn clone_from(&mut self, source: &Self)
fn clone_from(&mut self, source: &Self)
Performs copy-assignment from
source. Read moreSource§impl Debug for MergeResult
impl Debug for MergeResult
Source§impl<'de> Deserialize<'de> for MergeResult
impl<'de> Deserialize<'de> for MergeResult
Source§fn deserialize<__D>(
__deserializer: __D,
) -> Result<MergeResult, <__D as Deserializer<'de>>::Error>where
__D: Deserializer<'de>,
fn deserialize<__D>(
__deserializer: __D,
) -> Result<MergeResult, <__D as Deserializer<'de>>::Error>where
__D: Deserializer<'de>,
Deserialize this value from the given Serde deserializer. Read more
Source§impl Serialize for MergeResult
impl Serialize for MergeResult
Source§fn serialize<__S>(
&self,
__serializer: __S,
) -> Result<<__S as Serializer>::Ok, <__S as Serializer>::Error>where
__S: Serializer,
fn serialize<__S>(
&self,
__serializer: __S,
) -> Result<<__S as Serializer>::Ok, <__S as Serializer>::Error>where
__S: Serializer,
Serialize this value into the given Serde serializer. Read more
Auto Trait Implementations§
impl Freeze for MergeResult
impl RefUnwindSafe for MergeResult
impl Send for MergeResult
impl Sync for MergeResult
impl Unpin for MergeResult
impl UnsafeUnpin for MergeResult
impl UnwindSafe for MergeResult
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
Source§impl<T> CloneToUninit for Twhere
T: Clone,
impl<T> CloneToUninit for Twhere
T: Clone,
Source§impl<T> Instrument for T
impl<T> Instrument for T
Source§fn instrument(self, span: Span) -> Instrumented<Self>
fn instrument(self, span: Span) -> Instrumented<Self>
Source§fn in_current_span(self) -> Instrumented<Self>
fn in_current_span(self) -> Instrumented<Self>
Source§impl<T> IntoEither for T
impl<T> IntoEither for T
Source§fn into_either(self, into_left: bool) -> Either<Self, Self>
fn into_either(self, into_left: bool) -> Either<Self, Self>
Converts
self into a Left variant of Either<Self, Self>
if into_left is true.
Converts self into a Right variant of Either<Self, Self>
otherwise. Read moreSource§fn into_either_with<F>(self, into_left: F) -> Either<Self, Self>
fn into_either_with<F>(self, into_left: F) -> Either<Self, Self>
Converts
self into a Left variant of Either<Self, Self>
if into_left(&self) returns true.
Converts self into a Right variant of Either<Self, Self>
otherwise. Read more