Resolving Conflicts - Git Recipes - page 305

>>>>>>> fr
3
Right now, you have to edit the file and prepare the contents that you regard as the
proper solution for the conflict. You can use any editor you like, and you can insert any
contents you like. Open the file numbers.txt and change it according to Listing
9-6 .
Listing 9-6. The contents of numbers.txt file with manually edited contents
1
two - deux
3
When the file is saved you can verify that its status did not change. The command $
git status -s returns the same output as before: UU numbers.txt .
Once you have manually resolved the conflict you can change the status of the file
from UU into M_ . This is done with the $ git add numbers.txt command.
Committing the change with the $ git commit --no-edit command, you will
finish the recipe.
How It Works
When the $ git merge command produces a conflict the merging is paused. You
are left with a repository in which some files are denoted as UU . These files contain
conflicts that have to be resolved manually.
Every conflict is denoted with special markers:
<<<<<<<
=======
>>>>>>>
The first part of the conflict comes from your current branch, which is stored in
HEAD. Git informs you that your current branch (which in our recipe is en ) contains
the word two :