Enum FileResolution 

pub enum FileResolution {
    TakeOurs,
    TakeTheirs,
    Defer,
}

Choice for a single file conflict. No Custom variant (unlike Resolution): a file conflict has no “brand-new op” analogue — the only two things you can do with two divergent versions of an opaque blob are keep one or the other. See the module docs above.

Variants

TakeOurs

Keep dst’s (ours) entry for this path; discard src’s.

TakeTheirs

Keep src’s (theirs) entry for this path; discard dst’s.

Defer

Punt to a human reviewer, same as Resolution::Defer.

Trait Implementations

impl Clone for FileResolution

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 FileResolution

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

Formats the value using the given formatter.

impl<'de> Deserialize<'de> for FileResolution

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

where __D: Deserializer<'de>,

Deserialize this value from the given Serde deserializer.

impl Eq for FileResolution

impl PartialEq for FileResolution

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

Equality operator ==.

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

Inequality operator !=.

impl Serialize for FileResolution

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 FileResolution