Elektra  0.8.18
elektra-merge-strategies(7) -- how to merge key sets

In elektra-tools a three way merging was implemented. It can also use be used for two way merging, e.g. for importing.

Note: For a two-way merge, the ours version of the keys is used in place of base

The three-way merge works by comparing the ours KeySet and the theirs KeySet to the base KeySet. By looking for differences in these KeySets, a new KeySet called result is created that represents a merge of these KeySets.

STRATEGIES

Currently the following strategies exist: