Struct ConflictNode 

pub struct ConflictNode {
    pub patch_a_id: PatchId,
    pub patch_b_id: PatchId,
    pub base_patch_id: PatchId,
    pub touch_set: TouchSet,
    pub description: String,
    pub status: ConflictStatus,
}

A conflict node in the Patch-DAG.

Unlike a regular patch, a conflict node stores references to two conflicting patches and the base state. It can be resolved later by choosing one side or manually merging.

Fields

patch_a_id: PatchId

The patch from branch A.

patch_b_id: PatchId

The patch from branch B.

base_patch_id: PatchId

The base (common ancestor) patch ID.

touch_set: TouchSet

The addresses where the conflict occurs.

description: String

Human-readable description of the conflict.

status: ConflictStatus

Resolution status.

Implementations

impl ConflictNode

pub fn new( patch_a_id: PatchId, patch_b_id: PatchId, base_patch_id: PatchId, touch_set: TouchSet, description: String, ) -> Self

Create a new unresolved conflict node.

Trait Implementations

impl Clone for ConflictNode

fn clone(&self) -> ConflictNode

Returns a duplicate of the value.

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

Performs copy-assignment from source.

impl Debug for ConflictNode

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

Formats the value using the given formatter.

impl<'de> Deserialize<'de> for ConflictNode

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

where __D: Deserializer<'de>,

Deserialize this value from the given Serde deserializer.

impl Serialize for ConflictNode

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

where __S: Serializer,

Serialize this value into the given Serde serializer.