Struct ConflictSymbol 

pub struct ConflictSymbol {
    pub id: String,
    pub anchor: SymbolAnchor,
    pub base: ConflictSide,
    pub ours: ConflictSide,
    pub theirs: ConflictSide,
    pub candidate_resolutions: Vec<ConflictResolution>,
}

Fields

id: String

Stable id for this specific conflict (e.g., a UUID); used by heddle conflict resolve <id> to address it without parsing file paths or line numbers.

anchor: SymbolAnchor

base: ConflictSide

ours: ConflictSide

theirs: ConflictSide

candidate_resolutions: Vec<ConflictResolution>

Auto-detected candidate resolutions, in display order. The list may be empty when no candidate is obvious.

Implementations

impl ConflictSymbol

pub fn validate(&self) -> Result<(), ConflictError>

Trait Implementations

impl Clone for ConflictSymbol

fn clone(&self) -> ConflictSymbol

Returns a duplicate of the value.

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

Performs copy-assignment from source.

impl Debug for ConflictSymbol

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

Formats the value using the given formatter.

impl<'de> Deserialize<'de> for ConflictSymbol

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

where __D: Deserializer<'de>,

Deserialize this value from the given Serde deserializer.

impl Eq for ConflictSymbol

impl PartialEq for ConflictSymbol

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

Tests for self and other values to be equal, and is used by ==.

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

Tests for !=. The default implementation is almost always sufficient, and should not be overridden without very good reason.

impl Serialize for ConflictSymbol

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 ConflictSymbol