You know what a merge does conceptually and how to merge in Git. What you may
not know are the different types of merges. That’s what this piece is about.
This post is a slightly modified version of the Git merge section in Pro Git