Enum ResolutionRejection 

pub enum ResolutionRejection {
    UnknownConflict {
        conflict_id: ConflictId,
    },
    CustomOpMissingParents {
        conflict_id: ConflictId,
        expected: Vec<OpId>,
        got: Vec<OpId>,
    },
    TypeError {
        conflict_id: ConflictId,
        errors: Vec<String>,
    },
}

Why a resolution was rejected. Distinct from CommitError because a resolve call returns per-conflict verdicts; commit returns a single overall verdict.

Variants

UnknownConflict

The conflict_id doesn’t refer to any pending conflict in the session. Either the agent invented one, or it was already resolved and the session pruned it.

Fields

conflict_id: ConflictId

CustomOpMissingParents

The custom op’s parents don’t include both ours and theirs. A custom resolution that doesn’t acknowledge both sides isn’t a merge — it’s a fork.

Fields

conflict_id: ConflictId

expected: Vec<OpId>

got: Vec<OpId>

TypeError

The resolution is structurally valid but the program it produces — dst’s head with this resolution (and every resolution accepted so far) overlaid — does not type-check. Only returned by MergeSession::resolve_checked; the structural MergeSession::resolve never composes a program and so never emits this. errors are the composed program’s type errors, rendered by the injected ResolutionChecker.

Fields

conflict_id: ConflictId

errors: Vec<String>

Trait Implementations

impl Clone for ResolutionRejection

fn clone(&self) -> ResolutionRejection

Returns a duplicate of the value.

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

Performs copy-assignment from source.

impl Debug for ResolutionRejection

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

Formats the value using the given formatter.

impl<'de> Deserialize<'de> for ResolutionRejection

fn deserialize<__D>(__deserializer: __D) -> Result<Self, __D::Error>

where __D: Deserializer<'de>,

Deserialize this value from the given Serde deserializer.

impl Eq for ResolutionRejection

impl PartialEq for ResolutionRejection

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

Equality operator ==.

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

Inequality operator !=.

impl Serialize for ResolutionRejection

fn serialize<__S>(&self, __serializer: __S) -> Result<__S::Ok, __S::Error>

where __S: Serializer,

Serialize this value into the given Serde serializer.

impl StructuralPartialEq for ResolutionRejection