²⁵Notice how I use the branches themselves as parameters and I also use triple dot (...). That is so that git compares not the branches against each other but their last common ancestor against the second branch used as argument. That is so that you don’t have to sit down to try to figure out what the common ancestor was (it is provided in the conflict code block on some conflicts but not on others, just in case).