Merge algorithms

Eli Zaretskii eliz at gnu.org
Mon Aug 30 08:13:43 BST 2010


The documentation of "bzr merge" and "bzr remerge" mentions several
different algorithms accepted by the --merge-type option, but tell
almost nothing about them, nor says which one is the default.  All I
could find about this is (1) a bit of background in the "Criss-Cross"
section of the User Reference, and (2) a programmer-oriented
description of LCA merge under Developer Docs/Specifications.

Is there a user-level documentation of the available merge methods?
If not, could someone please post that here at least?  What I'm
looking for is (a) a short description of what each method does,
(b) situations for which each method is suited best, (c) performance.
Also, which of the methods is the default.

Apologies if this is in the docs, but I overlooked it.

TIA



More information about the bazaar mailing list