← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to doc/en/admin-guide/advanced.txt

  • Committer: Neil Martinsen-Burrell
  • Date: 2009-12-22 05:22:53 UTC
  • mto: (4924.1.1 doc)
  • mto: This revision was merged to the branch mainline in revision 4925.
  • Revision ID: nmb@wartburg.edu-20091222052253-t0mfui7m0jw1si56
change mention of merge --pull

Show diffs side-by-side

added added

removed removed

Lines of Context:
doc/en/admin-guide/advanced.txt
98
98
Note that Bazaar does not commit even cleanly applied merges by default.  This
99
99
is because although a merge may apply cleanly, the merged state still needs to
100
100
be checked before it is committed.  (Just because there are no text conflicts
101
 
does not mean that everything will work after a merge.)  If it is desired to
102
 
automatically commit when possible, use ``bzr merge --pull``.
 
101
does not mean that everything will work after a merge.)  An alternative that 
 
102
can pull when possible and merge otherwise is available with 
 
103
``bzr merge --pull``.
103
104
 
104
105
Merging back to local trunks
105
106
~~~~~~~~~~~~~~~~~~~~~~~~~~~~