Resolving Conflicts - Git Recipes - page 301

$ cd git-recipes
$ git init 09-01
$ cd 09-01
and then follow these steps:
1. Create the file numbers.txt with the contents shown in Listing 9-1
Listing 9-1. The numbers.txt file created in the master branch
1
2
3
2. Commit numbers.txt file with $ git snapshot Numbers:
1, 2, 3
3. Create the branch named en with $ git branch en
4. Create the branch named fr with $ git branch fr
5. Create a new commit in the en branch
a. Switch to the en branch with $ git checkout en
b. Change the contents of numbers.txt . Replace 2
with two as shown in Listing 9-2
Listing 9-2. The numbers.txt file commited in the en
branch
1
two
3
c. Commit the change with $ git snapshot Num-
bers: two