Struct ConflictResolution 

pub struct ConflictResolution {
    pub delete_files: Option<Vec<DeleteFileEntry>>,
    pub replace_contents: Option<Vec<ReplaceContentEntry>>,
    pub set_file_modes: Option<Vec<SetFileModeEntry>>,
}

If AUTOMERGE is the conflict resolution strategy, a list of inputs to use when resolving conflicts during a merge.

Fields

delete_files: Option<Vec<DeleteFileEntry>>

Files to be deleted as part of the merge conflict resolution.

replace_contents: Option<Vec<ReplaceContentEntry>>

Files to have content replaced as part of the merge conflict resolution.

set_file_modes: Option<Vec<SetFileModeEntry>>

File modes that are set as part of the merge conflict resolution.

Trait Implementations

impl Clone for ConflictResolution

fn clone(&self) -> ConflictResolution

Returns a duplicate of the value.

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

Performs copy-assignment from source.

impl Debug for ConflictResolution

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

Formats the value using the given formatter.

impl Default for ConflictResolution

fn default() -> ConflictResolution

Returns the “default value” for a type.

impl PartialEq for ConflictResolution

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

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 ConflictResolution