Enum MergeStep 

pub enum MergeStep {
    Merged {
        tree: String,
        subsumed_paths: Vec<String>,
        kept_landed_paths: Vec<String>,
    },
    Conflict(ReplayConflict),
}

What: The result of the merge half of a replay: the merged tree and what subsumption decided, or the conflict. Why: The incumbent revalidates the merged tree before it rebuilds the commit, so the two halves are separate steps.

In TS you’d write (pseudocode):

type MergeStep = { kind: 'merged'; treeOid; subsumedPaths; keptLandedPaths } | { kind: 'conflict'; ... };

Variants

Merged

The change applies cleanly.

Fields

tree: String

The merged tree.

subsumed_paths: Vec<String>

Paths whose prepared entries replay as they are.

kept_landed_paths: Vec<String>

Paths whose landed entries stay.

Conflict(ReplayConflict)

The change conflicts with the target.

Trait Implementations

impl Clone for MergeStep

fn clone(&self) -> Self

Returns a duplicate of the value.

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

Performs copy-assignment from source.

impl Debug for MergeStep

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

Formats the value using the given formatter.

impl Eq for MergeStep

impl PartialEq for MergeStep

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

Equality operator ==.

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

Inequality operator !=.

impl StructuralPartialEq for MergeStep