Include merge strategy sections
Add octopus merge recipe
Add recipe about reverting merges
Add recipe about external mergetool
Add recipe on git rerere