← 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: 2011-07-04 21:15:24 UTC
  • mto: (6034.1.1 filter-tree)
  • mto: This revision was merged to the branch mainline in revision 6035.
  • Revision ID: mbp@canonical.com-20110704211524-ilb7l6g4i3iizke7
Test exporting filtered tree to a zip (already works)

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 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
----------------------
53
54
 
54
55
Note that some merges can only be completed with the assistance
55
56
of a human. Details on how to resolve these are given in
56
 
`Resolving conflicts`_.
 
57
`Resolving conflicts <resolving_conflicts.html>`_.
57
58
 
58
59
Recording a merge
59
60
-----------------