$darkmode
Elektra 0.11.0
|
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
base
: The base
KeySet is the original version of the KeySet.ours
: The ours
KeySet represents the user's current version of the KeySet. This KeySet differs from base
for every key you changed.theirs
: The theirs
KeySet usually represents the default version of a KeySet (usually the package maintainer's version). This KeySet differs from base
for every key someone has changed.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.
Currently the following strategies exist: