File tree Expand file tree Collapse file tree 1 file changed +2
-2
lines changed
book/05-distributed-git/sections Expand file tree Collapse file tree 1 file changed +2
-2
lines changed Original file line number Diff line number Diff line change @@ -66,11 +66,11 @@ This is a variant of a multiple-repository workflow.
6666It's generally used by huge projects with hundreds of collaborators; one famous example is the Linux kernel.
6767Various integration managers are in charge of certain parts of the repository; they're called lieutenants.
6868All 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.
7070The process works like this (see <<wfdiag_c>>):
7171
72721. 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 .
74742. Lieutenants merge the developers' topic branches into their `master` branch.
75753. The dictator merges the lieutenants' `master` branches into the dictator's `master` branch.
76764. The dictator pushes their `master` to the reference repository so the other developers can rebase on it.
You can’t perform that action at this time.
0 commit comments