~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

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

• reverse the comparison (6158 to 5462.5.1)
• stop comparing with revision 5462.5.1

Show diffs side-by-side

added

removed

doc/en/user-guide/merging_changes.txt

29

29

has done in his. In this case, she needs to explicitly give the URL the

30

30

first time, e.g.::

31

31

 

32

 

  bzr merge sftp://mary@bill-laptop/cool-repo/cool-trunk

 

32

  bzr merge bzr+ssh://mary@bill-laptop/cool-repo/cool-trunk

33

33

 

34

 

This sets the default merge branch if one is not already set. To change the

35

 

default after it is set, use the ``--remember`` option.

 

34

This sets the default merge branch if one is not already set.  Use

 

35

``--no-remember`` to avoid setting it. To change the default after it is set,

 

36

use the ``--remember`` option.

36

37

 

37

38

How does merging work?

38

39

----------------------

• Older »

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