Struct ReplayConflict 

pub struct ReplayConflict {
    pub winning_oid: String,
    pub paths: Vec<String>,
    pub prepared_oid: String,
}

What: The replay result of an overlapping merge: the data for concurrent-commit/replay-conflict. Why: The named prepared commit stays in the object store so the user can cherry-pick it.

In TS you’d write (pseudocode):

type ReplayConflict = { winningOid; paths; preparedOid };

Fields

winning_oid: String

First landed commit after the base that touches a conflicting path.

paths: Vec<String>

Conflicting paths in Git path byte order.

prepared_oid: String

The prepared commit the replay could not land.

Trait Implementations

impl Clone for ReplayConflict

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 ReplayConflict

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

Formats the value using the given formatter.

impl Eq for ReplayConflict

impl PartialEq for ReplayConflict

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

Equality operator ==.

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

Inequality operator !=.

impl StructuralPartialEq for ReplayConflict