GIT - 5.3 The different types of branches and merges