BitKeeper - The Scalable Distributed Software Configuration Management System

The next part of the demo will illustrate how to merge conflicts. BK/ProMerge can complete many complicated merges automatically, but there will be times when there are merge conflicts that need to be resolved by a human being.

The BitKeeper update process does not apply changes to your repository until they have been merged. Instead, the changes are pulled into a sparse repository called the RESYNC repository. When there are conflicts to merged, the bk pull command tells you that as the last part of the output.

In the following section you will learn

what bk pull outputs when it can not automerge
how to run the resolver to resolve a conflict
what the file merge tool looks like and how to use it
how to check-in once you have performed a manual merge

Let's go see how that works.

Home Products How to Buy Customers Downloads Support Privacy Policy Bug DB Site Map Contact Us