Enum ConflictResolveError 

pub enum ConflictResolveError {
    InternalTool(Box<BuiltinToolError>),
    ExternalTool(ExternalToolError),
    InvalidRepoPath(InvalidRepoPathError),
    PathNotFound(RepoPathBuf),
    NotAConflict(RepoPathBuf),
    NotNormalFiles {
        path: RepoPathBuf,
        summary: String,
    },
    ConflictTooComplicated {
        path: RepoPathBuf,
        sides: usize,
    },
    ExecutableConflict {
        path: RepoPathBuf,
        summary: String,
    },
    EmptyOrUnchanged,
    Backend(BackendError),
    Io(Error),
}

Variants

InternalTool(Box<BuiltinToolError>)

ExternalTool(ExternalToolError)

InvalidRepoPath(InvalidRepoPathError)

PathNotFound(RepoPathBuf)

NotAConflict(RepoPathBuf)

NotNormalFiles

Fields

path: RepoPathBuf

summary: String

ConflictTooComplicated

Fields

path: RepoPathBuf

sides: usize

ExecutableConflict

Fields

path: RepoPathBuf

summary: String

EmptyOrUnchanged

Backend(BackendError)

Io(Error)

Trait Implementations

impl Debug for ConflictResolveError

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

Formats the value using the given formatter.

impl Display for ConflictResolveError

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

Formats the value using the given formatter.

impl Error for ConflictResolveError

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<BackendError> for ConflictResolveError

fn from(source: BackendError) -> Self

Converts to this type from the input type.

impl From<Box<BuiltinToolError>> for ConflictResolveError

fn from(source: Box<BuiltinToolError>) -> Self

Converts to this type from the input type.

impl From<ConflictResolveError> for CommandError

fn from(err: ConflictResolveError) -> Self

Converts to this type from the input type.

impl From<Error> for ConflictResolveError

fn from(source: Error) -> Self

Converts to this type from the input type.

impl From<InvalidRepoPathError> for ConflictResolveError

fn from(source: InvalidRepoPathError) -> Self

Converts to this type from the input type.