Information Technology Reference
In-Depth Information
look at the way conflicts are resolved.
In git, a conflict is resolved when you stage a
file
. This means that in all four recipes concerning conflicjts the most important job is
done by a well-know
$ git add
command.
9-1. Creating conflicting changes in text
files
Problem
You want to create a repository containing two branches that when merged or rebased
would produce a conflict in the text files. The repository you want to create is shown in
Figure 9-1
.
The repository with branches en and fr that will produce a conflict in the text files
Solution
Create a new repository:
