~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Andrew Bennetts
  • Date: 2009-12-03 05:57:41 UTC
  • mfrom: (4857 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4869.
  • Revision ID: andrew.bennetts@canonical.com-20091203055741-vmmg0fmjgjw2pwvu
MergeĀ lp:bzr.

Show diffs side-by-side

added added

removed removed

Lines of Context:
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.