Even when two branches change the same line of the same file differently, Git works it out on its own.