← 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: John Arbash Meinel
  • Date: 2008-05-06 14:34:57 UTC
  • mto: This revision was merged to the branch mainline in revision 3438.
  • Revision ID: john@arbash-meinel.com-20080506143457-mytwmwshmz1bu1uf
minor doc clarification for decentralized with shared-mainline

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 commit rights to the main branch. They do their work in their personal branch, then merge it into the mainline when it is ready.
 
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.
15
17
 
16
18
.. image:: images/workflows_shared.png
17
19
 
18
20
Other distributed workflows are explored later in this chapter.
 
21
 
 
22
.. 
 
23
   vim: tw=74 ft=rst