Struct Conflict 

pub struct Conflict {
    pub branch: String,
    pub branch_created_seq: u64,
    pub coll: String,
    pub id: String,
    pub base: Option<Value>,
    pub ours: Option<Value>,
    pub theirs: Option<Value>,
    pub kind: ConflictKind,
}

One document that two lines of history disagree about.

Fields

branch: String

Which branch this disagreement is WITH, and which generation of that name — see branch::branch_key.

A conflict without it is not identified. Two branches can make the same claim about the same document for entirely different reasons, and a human who resolved one has decided nothing at all about the other. The key that settles a conflict is therefore (branch, branch_created_seq, coll, id), never (coll, id):

base orders/42 = 1     branch X = 7
main           = 8     branch Y = 7

Resolving X must leave Y unresolved. Keyed only by document, X’s decision would silently authorise Y’s merge because the two happen to agree about the value — which is a human decision about one line of history being applied to another without anyone being asked.

branch_created_seq: u64

coll: String

id: String

base: Option<Value>

The common ancestor: the destination as of the branch’s base_seq.

ours: Option<Value>

The destination, now.

theirs: Option<Value>

The branch.

kind: ConflictKind

Trait Implementations

impl Clone for Conflict

fn clone(&self) -> Conflict

Returns a duplicate of the value.

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

Performs copy-assignment from source.

impl Debug for Conflict

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

Formats the value using the given formatter.

impl<'de> Deserialize<'de> for Conflict

fn deserialize<__D>( __deserializer: __D, ) -> Result<Conflict, <__D as Deserializer<'de>>::Error>

where __D: Deserializer<'de>,

Deserialize this value from the given Serde deserializer.

impl PartialEq for Conflict

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

Equality operator ==.

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

Inequality operator !=.

impl Serialize for Conflict

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.

impl StructuralPartialEq for Conflict