Forums

Hello. I'm having some trouble with resolving a couple conflicts. This is the second time I've had to do it, the first I completely messed up all the files. I am watching a YT video about emerge, which I've already configured, and the guy says that by pressing A or B you choose left or right side, which is local and remote. By pressing Next, he goes to the next change. The problem is that pressing A/B just types 'A' or 'B' in emerge. Also, should "Next" be "Enter"? A little help on the commands for emerge or a different merge tool in the browser would be appreciated. Thanks.

We can help you with problems related to our services, but for general git question you need to ask on more general forums.