← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Martin Pool
  • Date: 2008-05-01 02:42:46 UTC
  • mto: (3360.3.4 1.4)
  • mto: This revision was merged to the branch mainline in revision 3401.
  • Revision ID: mbp@sourcefrog.net-20080501024246-x13lcwcda0h7j49f
merge fix and test for #214894

Show diffs side-by-side

added added

removed removed

Lines of Context:
doc/en/user-guide/distributed_intro.txt
11
11
The decentralized with shared mainline workflow
12
12
-----------------------------------------------
13
13
 
14
 
In this workflow, each developer has their own branch or branches, plus
15
 
a checkout of the main branch. They do their work in their personal
16
 
branch, then merge it into the mainline when it is ready.
 
14
In this workflow, each developer has their own branch or branches, plus commit rights to the main branch. They do their work in their personal branch, then merge it into the mainline when it is ready.
17
15
 
18
16
.. image:: images/workflows_shared.png
19
17
 
20
18
Other distributed workflows are explored later in this chapter.
21
 
 
22
 
..
23
 
   vim: tw=74 ft=rst