Struct CellConflict 

pub struct CellConflict {
    pub component: String,
    pub occurrence: usize,
    pub identity: String,
    pub kind: ConflictKind,
    pub chosen: ItemValue,
    pub ours: ItemValue,
    pub theirs: ItemValue,
}

A surfaced 3-way conflict: the same keyed item was updated to different text on both sides at the SAME lawful lifecycle level. The merge applies a deterministic policy (ours-wins, see ConflictPolicy) and records the conflict here so callers never silently lose the losing side.

Lifecycle joins (a strike vs. a stale un-strike) are not conflicts — they resolve deterministically to the struck side (Live < Struck) and are excluded from this list. Only genuine same-level content disagreements count.

Fields

component: String

Component name (queue, exchange, …) the conflict occurred in.

occurrence: usize

0-based occurrence index of that component.

identity: String

Reorder-stable item identity (component:occurrence:item-id).

kind: ConflictKind

The kind of divergence (currently always ConflictKind::Content; a lifecycle join is never recorded as a conflict).

chosen: ItemValue

The value chosen by the merge policy (kept in merged_text).

ours: ItemValue

ours side’s value (the agent / committed-snapshot side).

theirs: ItemValue

theirs side’s value (the live editor / disk side).

Trait Implementations

impl Clone for CellConflict

fn clone(&self) -> Self

Returns a duplicate of the value.

fn clone_from(&mut self, source: &Self)

Performs copy-assignment from source.

impl Debug for CellConflict

fn fmt(&self, f: &mut Formatter<'_>) -> Result

Formats the value using the given formatter.

impl Eq for CellConflict

impl PartialEq for CellConflict

fn eq(&self, other: &Self) -> bool

Equality operator ==.

fn ne(&self, other: &Rhs) -> bool

Inequality operator !=.

impl StructuralPartialEq for CellConflict