Enum UnmergedKind 

pub enum UnmergedKind {
    BothDeleted,
    AddedByUs,
    DeletedByThem,
    AddedByThem,
    DeletedByUs,
    BothAdded,
    BothModified,
    Other,
}

Which unmerged combination git reported.

“Us” is the branch being merged INTO (HEAD / the branch you are rebasing onto); “them” is the incoming side. During a rebase or cherry-pick the two are inverted relative to what people expect — git replays your commits ONTO the upstream, so “us” is the upstream and “them” is your own commit. Naming the side is the whole value of distinguishing these: “both modified” and “deleted by them” call for completely different resolutions, and a generic “unmerged” tells the user neither.

Variants

BothDeleted

DD — deleted on both sides.

AddedByUs

AU — added by us, unmerged on their side.

DeletedByThem

UD — deleted by them.

AddedByThem

UA — added by them.

DeletedByUs

DU — deleted by us.

BothAdded

AA — added on both sides.

BothModified

UU — modified on both sides. The ordinary conflict.

Other

A U combination git documents no name for. Kept rather than guessed at: reporting it as one of the seven would be a lie, and dropping it would make the path invisible in the status — the same silent omission T used to have.

Implementations

impl UnmergedKind

pub const ALL: [Self; 8]

Every named combination, for exhaustive tests and label tables.

pub fn label(self) -> &'static str

Git’s own wording for this combination, as git status prints it in the long format.

Trait Implementations

impl Clone for UnmergedKind

fn clone(&self) -> UnmergedKind

Returns a duplicate of the value.

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

Performs copy-assignment from source.

impl Copy for UnmergedKind

impl Debug for UnmergedKind

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

Formats the value using the given formatter.

impl Eq for UnmergedKind

impl Hash for UnmergedKind

fn hash<__H: Hasher>(&self, state: &mut __H)

Feeds this value into the given Hasher.

fn hash_slice<H>(data: &[Self], state: &mut H)

where H: Hasher, Self: Sized,

Feeds a slice of this type into the given Hasher.

impl PartialEq for UnmergedKind

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

Equality operator ==.

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

Inequality operator !=.

impl StructuralPartialEq for UnmergedKind