Information Technology Reference
In-Depth Information
## master...origin/master [ahead 2]
The
master
branch in
marks-repo
contains two revisions that are not included
in Mark's
origin/master
tracking branch.
The state of all three repositories is shown in
Figure 10-21
.
Figure 10-21
.
The state in which John's master branch is ahead three, and Mark's master branch is ahead two
John successfully uploads his work to the shared reposit-
ory
Now the developers want to share their work. John is the first to push his changes to
the central repository:
# command issued in johns-repo
$ git push origin master
John's command succeeds. When John runs
$ git status -sb
again the out-
put doesn't contain
[ahead: 3]
anymore. His
master
branch is fully synchronized
with his
origin/master
branch right now.
Mark resolves the problem of divergent branches
The shared repository has changed because John has uploaded his revisions. But Mark
doesn't know about it. His command
$ git status -sb
returns exactly the same
information as before:
[ahead 2]
. Keep in mind that this information concerns only
