Information Technology Reference
In-Depth Information
Solution
Clone the repository from Recipe 9-1:
$ cd git-recipes
$ git clone-with-branches 09-01 09-03
$ cd 09-03
Rebase the en branch onto the fr branch with the $ git rebase fr en com-
mand. The rebasing will fail with the following message:
First, rewinding head to replay your work on top of it...
Applying: Numbers: two
Using index info to reconstruct a base tree...
M numbers.txt
Falling back to patching base and 3-way merge...
Auto-merging numbers.txt
CONFLICT (content): Merge conflict in numbers.txt
Failed to merge in the changes.
Patch failed at 0001 Numbers: two
The copy of the patch that failed is found in:
/git-recipes/09-03/.git/rebase-apply/patch
When you have resolved this problem, run "git rebase
--continue".
If you prefer to skip this patch, run "git rebase --skip"
instead.
To check out the original branch and stop rebasing, run
"git rebase --abort".
Rebasing was paused in the same manner as in Recipe 8-7. You have to resolve the
conflict and then you can continue rebasing.
The output of $ git status -s is:
UU numbers.txt
The conflicting files are labeled in exactly the same way as during the merge with
UU . When you open the numbers.txt file you will see that the content of the file is
Search WWH ::




Custom Search