| previous | | | next |
| home | sales | customers | jobs | contact | search |
Home 
Test Drive |
Pulling and Resolving a Conflict So, here we are. We've changed some code in our repo and made a small commit with our changes. We can see from the history what our changes look like, and now we're ready to move on and keep working. But now we find out that we need to pull some code from another repo. Someone else has done some work, and we need to merge their changes into our work before we keep going. Most often when changes are pulled into your repo, BitKeeper will handle auto-merging the changes without a hassle. But sometimes you pull changes from another repo that touch the same files in the same areas as ones you have already changed. This creates a conflict that BitKeeper doesn't know how to solve, so it relies on you to merge the conflict by hand. Let's pull in a change that will cause a conflict and see how that is resolved.
You'll see the familiar little pull dialog, but this time we're going to pull from http://bkdemo.bkbits.net/bk_demo2. Put http://bkdemo.bkbits.net/bk_demo2 into the Target URL box and click OK. The command window fires up again to do the pull, only now we see something like this:
BK has run into a conflict while merging the new changes, and it doesn't know how to resolve it, so it has dropped us into the resolver. It's waiting on us to decide what to do. If we press Enter at this prompt, we're given a list of available commands.
Next Step: Merge it all together
|
