...
The two commits made in sketches are reapplied starting from the head of the master branch. The resulting structure of commits is much cleaner than before. It is even possible rebase even allows to squeeze multiple commits into one using rebase. Note that in this example a merge conflict had to be resolved in the same way as it was done in Section "Branching and Merging"; instead of committing the resolved file, the rebase command is resumed with git rebase --continue.
...