rust_logic_graph::distributed::versioning

Struct ThreeWayMerge

pub struct ThreeWayMerge {
    pub base: ContextSnapshot,
    pub local: ContextSnapshot,
    pub remote: ContextSnapshot,
}

Expand description

Three-way merge for complex conflict resolution

Fields§

§base: ContextSnapshot

Base version (common ancestor)

§local: ContextSnapshot

Local changes

§remote: ContextSnapshot

Remote changes

Implementations§

Source §

impl ThreeWayMerge

Source

pub fn new( base: ContextSnapshot, local: ContextSnapshot, remote: ContextSnapshot, ) -> Self

Create a new three-way merge

Source

pub fn merge(&self) -> Result<DistributedContext>

Perform three-way merge

Auto Trait Implementations§

§

impl UnwindSafe for ThreeWayMerge

Blanket Implementations§

Source §

impl<T> Any for T
where T: 'static + ?Sized,

Source §

fn type_id(&self) -> TypeId

Gets the TypeId of self. Read more

Source §

impl<T> Borrow<T> for T
where T: ?Sized,

Source §

fn borrow(&self) -> &T

Immutably borrows from an owned value. Read more

Source §

impl<T> BorrowMut<T> for T
where T: ?Sized,

Source §

fn borrow_mut(&mut self) -> &mut T

Mutably borrows from an owned value. Read more

Source §

impl<T> From<T> for T

Source §

fn from(t: T) -> T

Returns the argument unchanged.

Source §

impl<T> Instrument for T

Source §

fn instrument(self, span: Span) -> Instrumented<Self>

Instruments this type with the provided Span, returning an Instrumented wrapper. Read more

Source §

fn in_current_span(self) -> Instrumented<Self>

Instruments this type with the current Span, returning an Instrumented wrapper. Read more

Source §

impl<T, U> Into for T
where U: From<T>,

Source §

fn into(self) -> U

Calls U::from(self).

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

Source §

impl<T> IntoEither for T

Source §

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 more

Source §

fn into_either_with<F>(self, into_left: F) -> Either<Self, Self>
where F: FnOnce(&Self) -> bool,

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

Source §