/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to doc/en/user-guide/resolving_conflicts.txt

  • Committer: Ian Clatworthy
  • Date: 2007-11-23 07:35:30 UTC
  • mto: (3054.1.1 ianc-integration)
  • mto: This revision was merged to the branch mainline in revision 3055.
  • Revision ID: ian.clatworthy@internode.on.net-20071123073530-02mv1ogbii1hvxgv
completed Central workflow chapter

Show diffs side-by-side

added added

removed removed

Lines of Context:
doc/en/user-guide/resolving_conflicts.txt
35
35
each file in question, fixing the relevant areas and removing the
36
36
conflict markers as you go.
37
37
 
38
 
After fixing all the files in conflict, and removing the markers,
39
 
ask Bazaar to mark them as resolved using the ``resolve`` command like this::
 
38
After fixing all the files in conflict, ask Bazaar to mark them as
 
39
resolved using the ``resolve`` command like this::
40
40
 
41
41
  bzr resolve
42
42
 
58
58
  bzr remerge --weave foo
59
59
 
60
60
where ``foo`` is the file and ``weave`` is one of the available
61
 
merge algorithms. This algorithm is particularly useful when a
62
 
so-called ``criss-cross`` merge is detected, e.g. when two branches
63
 
merge the same thing then merge each other. See the online help for
64
 
``criss-cross`` and ``remerge`` for further details.
 
61
merge algorithms. See the online help for ``remerge`` or the
 
62
User Reference for further details.
65
63
 
66
64
Using external tools to resolve conflicts
67
65
-----------------------------------------