/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: Jelmer Vernooij
  • Date: 2009-05-13 21:59:57 UTC
  • mto: This revision was merged to the branch mainline in revision 4360.
  • Revision ID: jelmer@samba.org-20090513215957-9se99cq16q0h460t
Support empty keys when looking for common prefixes in CHKMap.

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,
 
38
After fixing all the files in conflict, and removing the markers, 
39
39
ask Bazaar to mark them as resolved using the ``resolve`` command like this::
40
40
 
41
41
  bzr resolve