Enum StrategyOption 

pub enum StrategyOption {
    Normal,
    Ours,
    Theirs,
    Union,
}

Merge strategy option for resolving conflicting regions during vendor merges. These mirror the -X / --strategy-option values accepted by git merge.

Variants

Normal

Record conflicts in the index so that checkout produces conflict markers in the working directory (the default).

Ours

Resolve conflicts by taking “ours” (the local side).

Theirs

Resolve conflicts by taking “theirs” (the upstream/vendor side).

Union

Combine both sides, keeping each unique line (union merge).

Implementations

impl StrategyOption

pub fn to_file_favor(self) -> FileFavor

Convert to the corresponding git2::FileFavor.

Trait Implementations

impl Clone for StrategyOption

fn clone(&self) -> StrategyOption

Returns a duplicate of the value.

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

Performs copy-assignment from source.

impl Debug for StrategyOption

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

Formats the value using the given formatter.

impl Default for StrategyOption

fn default() -> StrategyOption

Returns the “default value” for a type.

impl ValueEnum for StrategyOption

fn value_variants<'a>() -> &'a [Self]

All possible argument values, in display order.

fn to_possible_value<'a>(&self) -> Option<PossibleValue>

The canonical argument value.

fn from_str(input: &str, ignore_case: bool) -> Result<Self, String>

Parse an argument into Self.

impl Copy for StrategyOption