A merge conflict

In this lesson you push two branches into each other twice. Git combines changes on its own as long as they do not overlap, but the moment two branches change the same line in different ways it stops and asks you. One conflict you resolve by hand, the other you cancel outright.

What is already set up

The ~/site directory holds a ready repository: two files and three branches. The commit identity is already configured, so git commit will not complain. You are standing on main. Branch feature changed the address in page.txt to team@example.com, branch rates put the price 150 into rates.txt, and main then edited both lines its own way. The sample text in the fi