Information Technology Reference
In-Depth Information
Figure 9-4
.
The repository with branches a and b that will produce a binary conflict
Solution
Create a new repository:
$ cd git-recipes
$ git init 09-04
$ cd 09-04
and then follow the steps:
1. Create the first revision with the
$ git commit --allow-empty
--allow-empty-message -m " "
command. That's how you can
produce an empty commit with empty comment.
2. Create a branch named
a
with
$ git branch a
3. Create a branch named
b
with
$ git branch b
4. Create a new commit in
a
branch
a. Switch to
a
branch with
$ git checkout a
b. Create the image displaying a cat and save it in the file
named
picture.jpg
c. Commit the change with
$ git snapshot Cat
5. Create a new commit in
b
branch
