- The base KeySet is the original version of the KeySet.
The ours KeySet represents the user's current version of the KeySet.
This KeySet differs from base for every key you changed.
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.
STRATEGIESCurrently the following strategies exist:
- Automerge only those keys where just one side deviates from base (default).
- Whenever a conflict exists, use our version.
- Whenever a conflict exists, use their version.
- Removes existing keys below the resultpath and replaces them with the merged keyset.
Preserves existing keys in the resultpath if they do not exist in the merged keyset.
If the key does exist in the merged keyset, it will be overwritten.
(avoid using it)