Enum ResolutionFailure

pub enum ResolutionFailure {
    OursRenamedTheirsRenamedDifferently {
        merged_blob: Option<ContentMerge>,
    },
    OursModifiedTheirsDirectoryThenOursRenamed {
        renamed_unique_path_to_modified_blob: BString,
    },
    OursAddedTheirsAddedTypeMismatch {
        their_unique_location: BString,
    },
    OursModifiedTheirsRenamedTypeMismatch,
    OursDeletedTheirsRenamed,
    OursModifiedTheirsDeleted,
    Unknown,
}

Describes of a conflict involving our change and their failed to be resolved.

Variants

OursRenamedTheirsRenamedDifferently

ours was renamed, but theirs was renamed differently. Both versions will be present in the tree,

Fields

merged_blob: Option<ContentMerge>

If Some(…), the content of the involved blob had to be merged.

OursModifiedTheirsDirectoryThenOursRenamed

ours was modified, but theirs was turned into a directory, so ours was renamed to a non-conflicting path.

Fields

renamed_unique_path_to_modified_blob: BString

The path at which ours can be found in the tree - it’s in the same directory that it was in before.

OursAddedTheirsAddedTypeMismatch

ours was added (or renamed into place) with a different mode than theirs, e.g. blob and symlink, and we kept the symlink in its original location, renaming the other side to their_unique_location.

Fields

their_unique_location: BString

The location at which their state was placed to resolve the name and type clash, named to indicate where the entry is coming from.

OursModifiedTheirsRenamedTypeMismatch

ours was modified, and they renamed the same file, but there is also a non-mergable type-change. Here we keep both versions of the file.

OursDeletedTheirsRenamed

ours was deleted, but theirs was renamed.

OursModifiedTheirsDeleted

ours was modified and theirs was deleted. We keep the modified one and ignore the deletion.

Unknown

ours and theirs are in an untested state so it can’t be handled yet, and is considered a conflict without adding our or their side to the resulting tree.

Trait Implementations

impl Clone for ResolutionFailure

fn clone(&self) -> ResolutionFailure

Returns a copy of the value.

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

Performs copy-assignment from source.

impl Debug for ResolutionFailure

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

Formats the value using the given formatter.