pub enum MergeResult<'a> {
    Conflict(Vec<Conflict>),
    Ready(MergeCommand<'a>),
}
Expand description

The result of an attempted merge.

Variants

Conflict(Vec<Conflict>)

A merge conflict occurred.

Ready(MergeCommand<'a>)

The merge is ready to be committed.

The command may be executed in order to create the commit from the merged tree.

Trait Implementations

Formats the value using the given formatter. Read more

Auto Trait Implementations

Blanket Implementations

Gets the TypeId of self. Read more

Immutably borrows from an owned value. Read more

Mutably borrows from an owned value. Read more

Performs the conversion.

Performs the conversion.

The type returned in the event of a conversion error.

Performs the conversion.

The type returned in the event of a conversion error.

Performs the conversion.