Skip to content

Commit 7c8c8ea

Browse files
author
Kaartic Sivaraam
committed
changed confusing lines in "Dictator and Lieutenants Workflow"
changed a step and a line that seemed a bit confusing and didn't match with the illustration.
1 parent 08331d3 commit 7c8c8ea

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

book/05-distributed-git/sections/distributed-workflows.asc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,11 +66,11 @@ This is a variant of a multiple-repository workflow.
6666
It's generally used by huge projects with hundreds of collaborators; one famous example is the Linux kernel.
6767
Various integration managers are in charge of certain parts of the repository; they're called lieutenants.
6868
All the lieutenants have one integration manager known as the benevolent dictator.
69-
The benevolent dictator's repository serves as the reference repository from which all the collaborators need to pull.
69+
The benevolent dictator pushes from his directory to a reference repository from which all the collaborators need to pull.
7070
The process works like this (see <<wfdiag_c>>):
7171

7272
1. Regular developers work on their topic branch and rebase their work on top of `master`.
73-
The `master` branch is that of the dictator.
73+
The `master` branch is that of the reference directory to which the dictator pushes.
7474
2. Lieutenants merge the developers' topic branches into their `master` branch.
7575
3. The dictator merges the lieutenants' `master` branches into the dictator's `master` branch.
7676
4. The dictator pushes their `master` to the reference repository so the other developers can rebase on it.

0 commit comments

Comments
 (0)