Skip to content

Commit 32bfc3d

Browse files
committed
Simple standardization of " -- " for em dashes in "Distributed Workflows"
1 parent 67fd8a9 commit 32bfc3d

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,16 @@
33
(((workflows)))
44
Unlike Centralized Version Control Systems (CVCSs), the distributed nature of Git allows you to be far more flexible in how developers collaborate on projects.
55
In centralized systems, every developer is a node working more or less equally on a central hub.
6-
In Git, however, every developer is potentially both a node and a hub that is, every developer can both contribute code to other repositories and maintain a public repository on which others can base their work and which they can contribute to.
6+
In Git, however, every developer is potentially both a node and a hub -- that is, every developer can both contribute code to other repositories and maintain a public repository on which others can base their work and which they can contribute to.
77
This opens a vast range of workflow possibilities for your project and/or your team, so we'll cover a few common paradigms that take advantage of this flexibility.
88
We'll go over the strengths and possible weaknesses of each design; you can choose a single one to use, or you can mix and match features from each.
99

1010
==== Centralized Workflow
1111

1212
(((workflows, centralized)))
13-
In centralized systems, there is generally a single collaboration model the centralized workflow.
13+
In centralized systems, there is generally a single collaboration model -- the centralized workflow.
1414
One central hub, or _repository_, can accept code, and everyone synchronizes their work to it.
15-
A number of developers are nodes consumers of that hub and synchronize to that one place.
15+
A number of developers are nodes -- consumers of that hub -- and synchronize to that one place.
1616

1717
.Centralized workflow.
1818
image::images/centralized_workflow.png[Centralized workflow.]
@@ -57,7 +57,7 @@ image::images/integration-manager.png[Integration-manager workflow.]
5757
(((forking)))
5858
This is a very common workflow with hub-based tools like GitHub or GitLab, where it's easy to fork a project and push your changes into your fork for everyone to see.
5959
One of the main advantages of this approach is that you can continue to work, and the maintainer of the main repository can pull in your changes at any time.
60-
Contributors don't have to wait for the project to incorporate their changes each party can work at their own pace.
60+
Contributors don't have to wait for the project to incorporate their changes -- each party can work at their own pace.
6161

6262
==== Dictator and Lieutenants Workflow
6363

0 commit comments

Comments
 (0)