gix_merge::blob::builtin_driver

Function binary

Source
pub fn binary(on_conflict: Option<ResolveWith>) -> (Pick, Resolution)
Expand description

As this algorithm doesn’t look at the actual data, it returns a choice solely based on logic. This also means that the caller has to assure this only gets called if the input doesn’t match.

It always results in a conflict with current being picked unless on_conflict is not None, which is when we always return Resolution::CompleteWithAutoResolvedConflict.