Information Technology Reference
In-Depth Information
7. You merge the work into the
master
with
$ git merge new-web-
interface
8. You publish the work to all of the other team members:
$ git push
origin master
How It Works
The integration of
new-web-interface
branch into the main development line in
master branch consists of two steps. First the leader has to fetch the work done in
new-web-interface
. This is done with the
$ git fetch
and
$ git check-
out new-web-interface
commands. After these two commands, the leader has
a local branch named
new-web-interface
.
Because
new-web-interface
is a local branch, the integration can be done
with arbitrary methods discussed in
chapters 6
and
7
.
Here we used the simple
$ git
merge
command. It can be also done with
$ git merge --no-ff
or
$ git
rebase
as well.
Once the
new-web-interface
branch was integrated into the
master
it can be
made public. To do this, the leader pushes the
master
branch into the
shared-
repo
.
10-9. Appending commits to a remote
branch
Problem
You are a developer who has already pushed his work to the
new-web-interface
branch in the shared repository. The leader has asked you to make some improvements.
You are to make some new commits in the
new-web-interface
branch.
In this recipe we are using the scenario from Recipe 10-7. You act as a developer
working in
johns-repo
.
Solution
