Information Technology Reference
In-Depth Information
Figure 9-3
.
The repository from Recipe 9-1 with the branch en rebased onto fr
This recipe is a simplified scenario where two developers work in different branches
and produce overlapping changes in one of the files. The recipe presents a method to
rebase your work onto the work of your colleague.
Listing 9-8.
The numbers.txt file you want to keep after rebasing the en branch onto fr
1
deux - two
3
