Part 5 Branches and Merging Revisited
Now you have the basics down, understand the concepts of branches, and have the know-how to collaborate with other developers. It’s time to revisit branches and some of the more advanced things you can do with them.
For basic branch usage, see Part III, Organizing Your Repository with Branches and Tags. This part covers tasks related to managing branches once they’ve been created. For example, what happens when you edit the same file in different ways in two branches and then attempt to merge them back together? A conflict can occur. We cover multiple ways to handle that in this part.
Covered in this part:
Conflicts are going to happen. Git tries to figure out how to handle merging changes as best ...