git Git merge: the different types 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