a conflict from another parent repo, and now we're ready to commit our merge.
BitKeeper has dropped us out of the fm3tool and back into the resolver which
looks something like this:
Type C and hit Enter.|
This will commit our merged changes. The citool that we've now seen before
will pop up to show us our merged changes. We can see the changes we made to
recovery.c, and it looks like the ChangeSet already has a comment.
Let's make a comment for recovery.c. You can use the comments to
explain what you did with the merge, or you can just use something like
Select the ChangeSet file.|
BitKeeper has already filed in a simple comment stating what happened.
We pulled bk_demo2 into our bk_demo_copy and merged the two. You can
take the time to write in your own merge comments here, but the standard
merge comments are useful for noting the difference between a merge and
a regular commit when looking through the change history.
Click the Commit button twice.|
The resolver finishes up the pull, does an integrity check, and then it's
done. You can close the command window once you've read what happened.
Push our changes back to our parent