Information Technology Reference
In-Depth Information
ours numbers.txt and $ git checkout fr numbers.txt is equivalent to
$ git checkout --theirs numbers.txt .
When you resolve all conflicts you can resume the paused merge with the $ git
commit --no-edit command. The option --no-edit is not mandatory—you
can skip it. But it takes the burden of typing or inspecting the commit's message off of
your shoulders.
Whenever in doubt, you can always abort the merge in progress with: $ git
merge --abort . The methods to undo a merge were discussed in chapter 6 .
Hint Resolving a merge conflict consists of three steps: 1) editing a file; 2) staging a
file with the $ git add command; and 3) finishing the merge with the $ git
commit --no-edit command.
9-3. Resolving textual conflict after re-
basing
Problem
For the repository created in the Recipe 9-1 you want to rebase the branch en onto fr .
Your aim is to produce the repository shown in Figure 9-3 . The conflicting line of
numbers.txt file should contain the contents shown in Listing 9-8 .
 
 
Search WWH ::




Custom Search