Struct OpenConflict 

pub struct OpenConflict {
    pub paths: Vec<String>,
    pub base_commit: String,
    pub branch_tip: String,
}

A merge left in progress in a session’s worktree, for the session to conclude.

What a continued branch whose base conflicts with it opens with unless the request refuses conflicts. Publication refuses the session as a sync conflict until the merge is concluded — resolved, staged and committed in the worktree — and every teardown aborts it rather than committing it.

Fields

paths: Vec<String>

The paths git left unmerged, in the order it listed them. Never empty.

base_commit: String

The full sha of the integration target that was merged into the branch.

branch_tip: String

The full sha the branch stood at before the merge.

Trait Implementations

impl Clone for OpenConflict

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 OpenConflict

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

Formats the value using the given formatter.

impl<'de> Deserialize<'de> for OpenConflict

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

where __D: Deserializer<'de>,

Deserialize this value from the given Serde deserializer.

impl Eq for OpenConflict

impl PartialEq for OpenConflict

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

Equality operator ==.

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

Inequality operator !=.

impl Serialize for OpenConflict

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 OpenConflict