Skip to content

Commit 2061538

Browse files
author
Kaartic Sivaraam
committed
Changed a sentence about Git project
A sentence about the git project seemed confusing to those who were not familiar with it. So changed it to make it more easily understandable.
1 parent 6ea9eb6 commit 2061538

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,8 @@ If they're safe, they're merged into `next`, and that branch is pushed up so eve
346346
image::images/large-merges-1.png[Managing a complex series of parallel contributed topic branches.]
347347

348348
If the topics still need work, they're merged into `pu` instead.
349-
When it's determined that they're totally stable, the topics are re-merged into `master` and are then rebuilt from the topics that were in `next` but didn't yet graduate to `master`.
349+
When it's determined that they're totally stable, the topics are re-merged into `master`.
350+
The `next` and `pu` branches are then rebuilt from the `master`.
350351
This means `master` almost always moves forward, `next` is rebased occasionally, and `pu` is rebased even more often:
351352

352353
.Merging contributed topic branches into long-term integration branches.

0 commit comments

Comments
 (0)