|
|
|
Pulling and resolving a conflict
When you pull in a conflict that must be merged manually, BitKeeper
will automatically run the resolver and will prompt you to resolve the
conflicts. Let's pull in a merge conflict:
 |
cd ..
bk pull http://bkdemo.bkbits.net/bk_demo2
|
You should see:
|
---------------------- Receiving the following csets --------------------------
1.124
----------------------------------------------------------------------------
ChangeSet: 1 deltas
e2fsck/recovery.c: 1 deltas
---------------------------------------------------------------------------
takepatch: saved entire patch in PENDING/2006-07-07.01
---------------------------------------------------------------------------
Applying 1 revisions to ChangeSet, renumbering, checking checksums
Applying 1 revisions to e2fsck/recovery.c
takepatch: 2 new revisions, 2 conflicts in 2 files
569 bytes uncompressed to 1363, 2.40X expansion
Running resolve to apply new work ...
Conflicts during automerge of e2fsck/recovery.c
resolve: 1 unresolved conflicts, starting manual resolve process for:
e2fsck/recovery.c
(content conflict) e2fsck/recovery.c>>
|
Because bk pull encountered merge conflicts, it
runs the resolver, which prompts you to resolve the conflicts.
(You can run the resolver manually with the bk resolve command.)
The resolver can handle a number of different conflict types, such
as content or rename conflicts.
Each conflict type has its own resolver "plugin" with a type
specific set of commands. In this example, you will be
handling a content conflict.
|
Press "Enter" to see the command options.
Press "f" and "Enter" to run the 3 way file merge.
|
| |
|
Home 
Test drive