Merging Branches - Git Recipes - page 219

6-5. Merging diverged branches
Problem
You want to merge the branches shown in Figure 6-5 . The f eature branch is to be
merged into the master branch. The repository you want to obtain is presented in
Figure 6-8 . Figure 6-8 underlines the order in which revisions m4 , m5 and f1 , f2 , f3
were created. In this recipe, this order is not important, therefore Figure 6-8 could also
be drawn as in Figure 6-9 .
Figure 6-8 . The repository obtained after the diverged branches are merged