Skip to content

Commit c404a2b

Browse files
committed
Merge pull request #568 from YueLinHo/i502
Fix issue #502: Doubled explanation in one paragraph of 5.2 Contributing..., subsec. Private small team
2 parents ec75603 + 6d479d5 commit c404a2b

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,7 @@ image::images/small-team-7.png[Jessica's history after pushing all changes back
303303

304304
That is one of the simplest workflows.
305305
You work for a while, generally in a topic branch, and merge into your master branch when it's ready to be integrated.
306-
When you want to share that work, you merge it into your own master branch, then fetch and merge `origin/master` if it has changed, and finally push to the `master` branch on the server.
306+
When you want to share that work, you fetch and merge your master from `origin/master` if it has changed, and finally push to the `master` branch on the server.
307307
The general sequence is something like this:
308308

309309
.General sequence of events for a simple multiple-developer Git workflow.

0 commit comments

Comments
 (0)