Enum ConflictError 

pub enum ConflictError {
    Soft {
        conflict: MaybeConflict,
        local: SyncStatus,
        remote: SyncStatus,
    },
    Hard,
}

Error created whan a conflict is detected.

Variants

Soft

Error generated when a soft conflict was detected.

A soft conflict may be resolved by searching for a common ancestor commit and merging changes since the common ancestor commit.

Fields

conflict: MaybeConflict

Conflict information.

local: SyncStatus

Local information sent to the remote.

remote: SyncStatus

Remote information in the server reply.

Hard

Error generated when a hard conflict was detected.

A hard conflict is triggered after a soft conflict attempted to scan proofs on a remote and was unable to find a common ancestor commit.

Trait Implementations

impl Debug for ConflictError

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

Formats the value using the given formatter.

impl Display for ConflictError

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

Formats the value using the given formatter.

impl Error for ConflictError

fn source(&self) -> Option<&(dyn Error + 'static)>

Returns the lower-level source of this error, if any.

fn description(&self) -> &str

👎Deprecated since 1.42.0: use the Display impl or to_string()

fn cause(&self) -> Option<&dyn Error>

👎Deprecated since 1.33.0: replaced by Error::source, which can support downcasting

fn provide<'a>(&'a self, request: &mut Request<'a>)

🔬This is a nightly-only experimental API. (error_generic_member_access)

Provides type-based access to context intended for error reports.

impl From<ConflictError> for Error

fn from(source: ConflictError) -> Self

Converts to this type from the input type.