Struct Options

pub struct Options {
    pub rewrites: Option<Rewrites>,
    pub blob_merge: Options,
    pub blob_merge_command_ctx: Context,
    pub fail_on_conflict: Option<TreatAsUnresolved>,
    pub marker_size_multiplier: u8,
    pub symlink_conflicts: Option<ResolveWith>,
    pub allow_lossy_resolution: bool,
}

A way to configure tree().

Fields

rewrites: Option<Rewrites>

If not None, rename tracking will be performed when determining the changes of each side of the merge.

blob_merge: Options

Decide how blob-merges should be done. This relates to if conflicts can be resolved or not.

blob_merge_command_ctx: Context

The context to use when invoking merge-drivers.

fail_on_conflict: Option<TreatAsUnresolved>

If Some(what-is-unresolved), the first unresolved conflict will cause the entire merge to stop. This is useful to see if there is any conflict, without performing the whole operation, something that can be very relevant during merges that would cause a lot of blob-diffs.

marker_size_multiplier: u8

This value also affects the size of merge-conflict markers, to allow differentiating merge conflicts on each level, for any value greater than 0, with values N causing N*2 markers to be added to the configured value.

This is used automatically when merging merge-bases recursively.

symlink_conflicts: Option<ResolveWith>

If None, when symlinks clash ours will be chosen and a conflict will occur. Otherwise, the same logic applies as for the merge of binary resources.

allow_lossy_resolution: bool

If true, instead of issuing a conflict with ResolutionFailure, do nothing and keep the base/ancestor version. This is useful when one wants to avoid any kind of merge-conflict to have some, lossy resolution.

Trait Implementations

impl Clone for Options

fn clone(&self) -> Options

Returns a copy of the value.

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

Performs copy-assignment from source.

impl Debug for Options

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

Formats the value using the given formatter.

impl Default for Options

fn default() -> Options

Returns the “default value” for a type.