← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: John Arbash Meinel
  • Date: 2010-02-17 17:11:16 UTC
  • mfrom: (4797.2.17 2.1)
  • mto: (4797.2.18 2.1)
  • mto: This revision was merged to the branch mainline in revision 5055.
  • Revision ID: john@arbash-meinel.com-20100217171116-h7t9223ystbnx5h8
merge bzr.2.1 in preparation for NEWS entry.

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