Information Technology Reference
In-Depth Information
Figure 9-5
.
The repository from Recipe 9-4 with the merged branches a and b
Solution
Clone the repository from Recipe 9-4:
$ cd git-recipes
$ git clone-with-branches 09-04 09-05
$ cd 09-05
$ git checkout a
Your current branch now is
a
. Merge
b
branch into
a
with the
$ git merge b
command. As you can guess the merge fails. The message informs you about a binary
conflict in the
picture.jpg
file:
warning: Cannot merge binary files: picture.jpg (HEAD vs.
b)
Auto-merging picture.jpg
CONFLICT (add/add): Merge conflict in picture.jpg
Automatic merge failed; fix conflicts and then commit the
result.
