Struct MergeCommitOutput 

pub struct MergeCommitOutput {
    pub resolved: Vec<(ConflictId, Resolution)>,
    pub resolved_files: Vec<(FilePath, FileResolution)>,
    pub needs_setfiles: bool,
}

What MergeSession::commit hands the caller to land: the resolved sig conflicts (as before #1007) plus the resolved file conflicts and whether the merge needs a SetFiles op at all (#1007 PR 7 — see MergeSession::attach_file_conflicts).

Fields

resolved: Vec<(ConflictId, Resolution)>

resolved_files: Vec<(FilePath, FileResolution)>

needs_setfiles: bool

True when dst’s and src’s files manifests disagreed at all (even if every path auto-resolved with no FileConflict) — the merge commit must append a SetFiles recording the merged manifest, per #1007 §1. False when the session was never told about a files dimension, or the manifests already agreed.

Trait Implementations

impl Clone for MergeCommitOutput

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 MergeCommitOutput

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

Formats the value using the given formatter.

impl Eq for MergeCommitOutput

impl PartialEq for MergeCommitOutput

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

Equality operator ==.

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

Inequality operator !=.

impl StructuralPartialEq for MergeCommitOutput