Struct FileConflict 

pub struct FileConflict {
    pub path: FilePath,
    pub base: Option<FileEntry>,
    pub ours: Option<FileEntry>,
    pub theirs: Option<FileEntry>,
}

A path whose manifest entry differs on both sides of a merge, and differs from the base too — a real content conflict, not a one-sided edit (those auto-resolve before this is ever surfaced; see Store::manifest_merge’s doc comment for the auto-resolve rule).

Blobs are opaque bytes (binary allowed, per #1007 §2) so there is no meaningful 3-way content merge the way there is for text lines — resolving a FileConflict means picking a side (FileResolution::TakeOurs / FileResolution::TakeTheirs), not splicing bytes. See the module docs on why real content merging is out of scope for #1007 PR 7.

Fields

path: FilePath

base: Option<FileEntry>

The path’s entry on the merge base (the LCA’s manifest). None if the path didn’t exist there (both sides added it differently — the file-level analogue of ConflictKind::AddAdd).

ours: Option<FileEntry>

The path’s entry on dst’s side. None if dst doesn’t have it (removed, or never added).

theirs: Option<FileEntry>

The path’s entry on src’s side. None if src doesn’t have it.

Trait Implementations

impl Clone for FileConflict

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 FileConflict

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

Formats the value using the given formatter.

impl<'de> Deserialize<'de> for FileConflict

fn deserialize<__D>(__deserializer: __D) -> Result<Self, __D::Error>

where __D: Deserializer<'de>,

Deserialize this value from the given Serde deserializer.

impl Eq for FileConflict

impl PartialEq for FileConflict

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

Equality operator ==.

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

Inequality operator !=.

impl Serialize for FileConflict

fn serialize<__S>(&self, __serializer: __S) -> Result<__S::Ok, __S::Error>

where __S: Serializer,

Serialize this value into the given Serde serializer.

impl StructuralPartialEq for FileConflict