O'Reilly logo

Bazaar Version Control by Janos Gyerik

Stay ahead with the world's most comprehensive technology and business learning platform.

With Safari, you learn the way you learn best. Get unlimited access to videos, live online training, learning paths, books, tutorials, and more.

Start Free Trial

No credit card required

Merging branches

Merging branches is a complex operation in any version control system. The merge operation in Bazaar combines the changes of another branch into the current branch, and copies all the revision metadata including the historical ordering information as well.

Performing a three-way merge

The default merge algorithm used by Bazaar is the so-called three-way merge. The first step in this algorithm is identifying the base revision of the two branches; that is, the point after which the branches have diverged. For example, given the following two branches, the base revision is 2, which is also the common ancestor of the two branches:

Performing a three-way merge

The ...

With Safari, you learn the way you learn best. Get unlimited access to videos, live online training, learning paths, books, interactive tutorials, and more.

Start Free Trial

No credit card required