md_doc_help_elektra-merge-strategy(3) how to merge key sets


Currently the following strategies exist:

  • preserve: Automerge only those keys where just one side deviates from base (default).
  • ours: Whenever a conflict exists, use our version.
  • theirs: Whenever a conflict exists, use their version.
  • cut: Removes existing keys below the resultpath and replaces them with the merged keyset.
  • import: 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)