.\" generated with Ronn/v0.7.3
.\" http://github.com/rtomayko/ronn/tree/0.7.3
.
.TH "ELEKTRA\-MERGE\-STRATEGIES" "7" "2015-11-19" "" ""
.
.SH "NAME"
\fBelektra\-merge\-strategies\fR \- how to merge key sets
.
.P
In elektra\-tools a three way merging was implemented\. It can also use be used for two way merging, e\.g\. for importing\.
.
.P
Note: For a two\-way merge, the \fBours\fR version of the keys is used in place of \fBbase\fR
.
.SH "3\-WAY"
.
.TP
\fBbase\fR
The \fBbase\fR KeySet is the original version of the KeySet\.
.
.TP
\fBours\fR
The \fBours\fR KeySet represents the user\'s current version of the KeySet\.
.
.br
This KeySet differs from \fBbase\fR for every key you changed\.
.
.TP
\fBtheirs\fR
The \fBtheirs\fR KeySet usually represents the default version of a KeySet (usually the package maintainer\'s version)\.
.
.br
This KeySet differs from \fBbase\fR for every key someone has changed\.
.
.P
The three\-way merge works by comparing the \fBours\fR KeySet and the \fBtheirs\fR KeySet to the \fBbase\fR KeySet\. By looking for differences in these KeySets, a new KeySet called \fBresult\fR is created that represents a merge of these KeySets\.
.
.SH "STRATEGIES"
Currently the following strategies exist:
.
.TP
preserve
Automerge only those keys where just one side deviates from base (default)\.
.
.TP
ours
Whenever a conflict exists, use our version\.
.
.TP
theirs
Whenever a conflict exists, use their version\.
.
.TP
cut
Removes existing keys below the resultpath and replaces them with the merged keyset\.
.
.TP
import
Preserves existing keys in the resultpath if they do not exist in the merged keyset\.
.
.br
If the key does exist in the merged keyset, it will be overwritten\.
.
.br
(avoid using it)