Struct ConflictState 

pub struct ConflictState {
    pub operation_label: String,
    pub original_branch_oid: String,
    pub new_tip_oid: String,
    pub conflicting_commit_oid: String,
    pub remaining_oids: Vec<String>,
    pub conflicting_files: Vec<String>,
    pub still_unresolved: bool,
    pub moved_commit_oid: Option<String>,
    pub squash_context: Option<SquashContext>,
}

Enough state to resume or abort a conflicted rebase.

When a cherry-pick produces conflicts during a rebase, the partially merged index is written to the working tree. The user resolves the conflicts, then calls rebase_continue (which reads the resolved index and creates the commit) or rebase_abort (which restores the branch to original_branch_oid).

Fields

operation_label: String

Human-readable label for the operation that triggered this conflict (e.g. “Drop”, “Squash”). Used in dialog titles and messages.

original_branch_oid: String

The branch tip OID before the operation started, used to restore on abort.

new_tip_oid: String

The new tip OID built so far (all commits cherry-picked before the conflicting one).

conflicting_commit_oid: String

The OID of the commit whose cherry-pick conflicted.

remaining_oids: Vec<String>

OIDs of commits that still need to be cherry-picked after the conflicting commit is resolved, in order (oldest first).

conflicting_files: Vec<String>

Paths of files that have conflict markers in the index (stage > 0). Collected at the point of conflict so the dialog can list them.

still_unresolved: bool

True when rebase_continue was called but the index still had unresolved entries. The dialog uses this to show a warning to the user.

moved_commit_oid: Option<String>

When this conflict was triggered by a move operation, this holds the OID of the commit being moved. The conflict view uses it to tell the user whether the moved commit itself conflicted or a successor did.

squash_context: Option<SquashContext>

When present, the conflict arose during the initial squash tree creation (source vs target overlap). After the user resolves the conflict the TUI should open the editor and then call squash_finalize instead of rebase_continue.

Implementations

impl ConflictState

pub fn is_squash_tree_conflict(&self) -> bool

Whether this conflict arose from a squash-time tree conflict (as opposed to a descendant rebase conflict).

Trait Implementations

impl Clone for ConflictState

fn clone(&self) -> ConflictState

Returns a duplicate of the value.

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

Performs copy-assignment from source.

impl Debug for ConflictState

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

Formats the value using the given formatter.

impl PartialEq for ConflictState

fn eq(&self, other: &ConflictState) -> 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 Eq for ConflictState

impl StructuralPartialEq for ConflictState