Enum git_workarea::Conflict

pub enum Conflict {
    Path(PathBuf),
    SubmoduleNotMerged(PathBuf),
    SubmoduleNotPresent(PathBuf),
    SubmoduleWithFix(PathBuf, CommitId),
}

Representation of merge conflict possibilities.

Variants

Path(PathBuf)

Tuple Fields

0: PathBuf

A regular blob has conflicted.

SubmoduleNotMerged(PathBuf)

Tuple Fields

0: PathBuf

A submodule points to a commit not merged into the target branch.

SubmoduleNotPresent(PathBuf)

Tuple Fields

0: PathBuf

The submodule points to a commit not present in the main repository.

SubmoduleWithFix(PathBuf, CommitId)

Tuple Fields

0: PathBuf

1: CommitId

The submodule conflicts, but a resolution is available.

This occurs when the submodule points to a commit not on the first-parent history of the target branch on both sides of the merge. The suggested commit is the oldest commit on the main branch which contains both branches.

Implementations

impl Conflict

pub fn path(&self) -> &Path

The path to the blob that for the conflict.

Trait Implementations

impl Debug for Conflict

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

Formats the value using the given formatter.

impl PartialEq<Conflict> for Conflict

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

This method tests for self and other values to be equal, and is used by ==.

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

This method tests for !=.