← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Martin Pool
  • Date: 2008-03-19 01:40:18 UTC
  • mto: This revision was merged to the branch mainline in revision 3297.
  • Revision ID: mbp@sourcefrog.net-20080319014018-ihd39j2o886xmp15
Better formatting of python version in --version

Show diffs side-by-side

added added

removed removed

Lines of Context:
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 bzr+ssh://mary@bill-laptop/cool-repo/cool-trunk
 
32
  bzr merge sftp://mary@bill-laptop/cool-repo/cool-trunk
33
33
 
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.
 
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.
37
36
 
38
37
How does merging work?
39
38
----------------------
54
53
 
55
54
Note that some merges can only be completed with the assistance
56
55
of a human. Details on how to resolve these are given in
57
 
`Resolving conflicts <resolving_conflicts.html>`_.
 
56
`Resolving conflicts`_.
58
57
 
59
58
Recording a merge
60
59
-----------------