Commits

Yujie Wu  committed d7e75a7

Edited online

  • Participants
  • Parent commits c444105

Comments (0)

Files changed (1)

 \\
 = Generalized Driessen's Branching Model =
 
-According to the definition above, stream in its bare essence is a set of
-branches. If we remove arbitrary restrictions in the original concept, //we
+Stream in its bare essence is a set of branches. Removing some restrictions in the original concept, //we
 generalize stream to refer to any set of branches.// This simple generalization
-results in a much more powerful and flexible model.
+results in a more powerful and flexible model.
 
 There is one particularly useful type of stream. Say we have a branch called
 //trunk//. We can open new branches from the trunk, and later we can merge the
 branches back to it. This is in fact a common branching and merging
 pattern. All branches from the same trunk plus the trunk itself natually form
-a stream, and we call it ##**natural**## stream. We don't have to do something
+a stream, and we call it ##**natural stream**##. We don't have to do something
 special to create a natural stream, which coexists with the corresponding branch.
 In contrast, the master, develop, feature, release, hotfix, and
 support are preexisting streams, and they are sortof artificial. Hgflow has been