7
Unlike some other tools that force you to resolve each conflict during
8
the merge process, Bazaar merges as much as it can and then reports the
9
conflicts. This can make conflict resolution easier because the contents
10
of the whole post-merge tree are available to help you decide how things
11
ought to be resolved. You may also wish to selectively run tests as you go
12
to confirm each resolution or group or resolutions is good.
17
As well as being reported by the ``merge`` command, the list of outstanding
18
conflicts may be displayed at any time by using the ``conflicts``
19
command. It is also included as part of the output from the ``status``
25
When a conflict is encountered, the ``merge`` command puts embedded
26
markers in each file showing the areas it couldn't resolve. It also
27
creates 3 files for each file with a conflict:
33
where ``foo`` is the name of the conflicted file.
34
In many cases, you can resolve conflicts by simply manually editing
35
each file in question, fixing the relevant areas and removing the
36
conflict markers as you go.
38
After fixing all the files in conflict, ask Bazaar to mark them as
39
resolved using the ``resolve`` command like this::
43
Alternatively, after fixing each file, you can mark it as resolved
48
Among other things, the ``resolve`` command cleans up the BASE,
49
THIS and OTHER files from your working tree.
51
Using the remerge command
52
-------------------------
54
In some cases, you may wish to try a different merge algorithm on a
55
given file. To do this, use the ``remerge`` command nominating
58
bzr remerge --weave foo
60
where ``foo`` is the file and ``weave`` is one of the available
61
merge algorithms. See the online help for ``remerge`` or the
62
User Reference for further details.
64
Using external tools to resolve conflicts
65
-----------------------------------------
67
If you have a GUI tool you like using to resolve conflicts, be sure
68
to install the *extmerge* plugin. Once installed, it can be used
73
where ``foo`` is the conflicted file. Rather than provide a list of
74
files to resolve, you can give the ``--all`` option to implicitly
75
specify all conflicted files.
77
The ``extmerge`` command uses the tool specified by the
78
``external_merge`` setting in your ``bazaar.conf`` file.
79
If not set, it will look for some popular merge tools such
80
as ``kdiff3`` or ``opendiff``, the latter being a command
81
line interface to the FileMerge utility in OS X.
added
removed
doc/en/user-guide/resolving_conflicts.txt
