← 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: Ian Clatworthy
  • Date: 2007-11-27 21:17:06 UTC
  • mto: (3054.1.1 ianc-integration)
  • mto: This revision was merged to the branch mainline in revision 3055.
  • Revision ID: ian.clatworthy@internode.on.net-20071127211706-871zcqst0yi5tcvl
make fixes suggested by proof-readers

Show diffs side-by-side

added added

removed removed

Lines of Context:
doc/en/user-guide/merging_changes.txt
63
63
 
64
64
  bzr commit -m "Merged Mary's changes"
65
65
 
66
 
Even if there are no conflicts, an explicit merge is still required.
 
66
Even if there are no conflicts, an explicit commit is still required.
67
67
Unlike some other tools, this is considered a feature in Bazaar.
68
68
A clean merge is not necessarily a good merge so making the commit
69
69
a separate explicit step allows you to run your test suite first to