Information Technology Reference
In-Depth Information
Figure 7-11
.
The repository you will obtain after applying Recipe 7-6 to the repository from Figure 6-5
Solution
Clone the repository from Recipe 6-4 with branches:
$ cd git-recipes
$ git clone-with-branches 06-04 07-06
$ cd 07-06
and then follow these steps:
1. Rebase the
feature
branch onto the
master
branch with
$ git
rebase master feature
2. Switch to the
master
branch with
$ git checkout master
3. Merge the
feature
branch into the
master
branch with
$ git
merge --no-ff feature
How It Works
