pub enum ConflictPolicy {
OursWins,
TheirsWins,
}Expand description
How a same-item-both-sides conflict is resolved deterministically. Recorded
in the outcome regardless; the chosen value lands in merged_text.
Variants§
OursWins
Keep ours (the agent / committed-snapshot side). Default — mirrors the
exchange committed-history spine in reconcile_component_body.
TheirsWins
Keep theirs (the live editor / disk side).
Trait Implementations§
Source§impl Clone for ConflictPolicy
impl Clone for ConflictPolicy
impl Copy for ConflictPolicy
Source§impl Debug for ConflictPolicy
impl Debug for ConflictPolicy
Source§impl Default for ConflictPolicy
impl Default for ConflictPolicy
impl Eq for ConflictPolicy
Source§impl PartialEq for ConflictPolicy
impl PartialEq for ConflictPolicy
impl StructuralPartialEq for ConflictPolicy
Auto Trait Implementations§
impl Forget for ConflictPolicy
impl Freeze for ConflictPolicy
impl RefUnwindSafe for ConflictPolicy
impl Send for ConflictPolicy
impl Sync for ConflictPolicy
impl Unpin for ConflictPolicy
impl UnsafeUnpin for ConflictPolicy
impl UnwindSafe for ConflictPolicy
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<Q, K> Equivalent<K> for Q
impl<Q, K> Equivalent<K> for Q
Source§impl<Q, K> Equivalent<K> for Q
impl<Q, K> Equivalent<K> for Q
Source§impl<Q, K> Equivalent<K> for Q
impl<Q, K> Equivalent<K> for Q
Source§fn equivalent(&self, key: &K) -> bool
fn equivalent(&self, key: &K) -> bool
Compare self to
key and return true if they are equal.