~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

• browse files at revision 4797.33.16
• compare with another revision
• download diff
• download tarball
• view history from revision 4797.33.16

• reverse the comparison (4797.33.16 to 3146.5.2)
• stop comparing with revision 3146.5.2

Show diffs side-by-side

added

removed

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, ask Bazaar to mark them as

39

 

resolved using the ``resolve`` command like this::

 

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::

40

40

 

41

41

  bzr resolve

42

42

 

• Older »

Loggerhead is a web-based interface for Breezy
Version: 2.0.1