Book can be downloaded from here
Let’s dive a little bit into the things that take place when there is a content conflict. In order to understand this section the best, you should have a crystal-clear understanding of what these concepts are in git specifically:
If you are not clear on what they are, then stop right now and come back when you are. I promise I won’t move forward with the explanations until you come back. Pinky promise!