Information Technology Reference
In-Depth Information
Figure 9-6
.
Git cannot merge two separate binary files into one file
or with:
$ git checkout a [filename]
$ git checkout b [filename]
Conflicted binary files are denoted with
AA
. This is another difference as textual
conflicts are denoted with
UU
.
The rest, which is resolving a conflict and finishing a merge, is performed as was
done previously with the
$ git add
and
$ git commit --no-edit
com-
mands.
9-6. Resolving a binary conflict during
rebasing
Problem
