Enum MergeOutcome 

pub enum MergeOutcome {
    Clean,
    Conflict {
        files: Vec<String>,
    },
    RefusedPreMerge {
        detail: String,
    },
}

Outcome of a GitRepo::merge_no_ff into the current branch (roadmap M3).

A Conflict merge is always rolled back with git merge --abort before it is returned, so the working tree is left clean either way — the caller never has to clean up a half-merged tree. A RefusedPreMerge failure never had a merge in progress (no MERGE_HEAD), so no abort is attempted — there is nothing to roll back.

Variants

Clean

The branch merged cleanly; the merge commit is on the current branch.

Conflict

The merge hit conflicts and was aborted. files lists the conflicting paths git reported (best-effort; empty when git named none).

Fields

files: Vec<String>

RefusedPreMerge

Git refused the merge before it started (no MERGE_HEAD was ever created) — e.g. an untracked file at a path the merge would bring in. detail is git’s verbatim stderr/stdout for the failed merge command. No git merge --abort is attempted, since there is no merge in progress to abort.

Fields

detail: String

Trait Implementations

impl Clone for MergeOutcome

fn clone(&self) -> MergeOutcome

Returns a duplicate of the value.

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

Performs copy-assignment from source.

impl Debug for MergeOutcome

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

Formats the value using the given formatter.

impl Eq for MergeOutcome

impl PartialEq for MergeOutcome

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

Equality operator ==.

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

Inequality operator !=.

impl StructuralPartialEq for MergeOutcome