← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2009-10-13 06:08:53 UTC
  • mfrom: (4737.1.1 merge-2.0-into-devel)
  • Revision ID: pqm@pqm.ubuntu.com-20091013060853-erk2aaj80fnkrv25
(andrew) Merge lp:bzr/2.0 into lp:bzr, including fixes for #322807,
        #389413, #402623 and documentation improvements.

Show diffs side-by-side

added added

removed removed

Lines of Context:
doc/en/user-guide/zen.txt
56
56
  102: Add code and tests for X
57
57
  101: Add tests for Y
58
58
  100: ...
59
 
 
 
59
  
60
60
Many teams use this approach because their tools make branching and merging
61
61
difficult. As a consequence, developers update from and commit to the trunk
62
62
frequently, minimizing integration pain by spreading it over every commit.