Resolving Conflicts - Git Recipes - page 311

changed, however. The numbers.txt file right after $ git rebase fr en is
shown in Listing 9-9 .
Listing 9-9. The contents of numbers.txt file right after the $ git rebase fr en command
1
<<<<<<< HEAD
deux
=======
two
>>>>>>> Numbers: two
3
The rebasing starts with the checkout of the tip commit of the fr branch. Thus, the
contents presented in HEAD section come from the fr branch:
<<<<<<< HEAD
deux
=======
The first patch applied during rebase is from the commit labeled as Numbers:
two . As a result, the second portion of a conflict is formatted as:
=======
two
>>>>>>> Numbers: two
Right now, you have to edit the file and type in the contents presented in Listing 9-8 .
Finally, stage the file with the $ git add numbers.txt command. This com-
mand will change the state of the file from UU into M_ . Finish the recipe proceeding
with the paused rebase: $ git rebase --continue .
How It Works
If there is a conflict during rebasing, the operation is paused. You have to manually re-
solve the conflict. The procedure is exactly the same as in the case of a merge conflict: