树冲突错误GIT储存库Xcode

Question

I am using Xcode and am trying to merge branches. I am receiving the "tree conflicts" error and do not understand the problem. I somehow have a branch with multiple versions. Ex. MainBranch1, MainBranch2, MainBranch3

Answer 1

You can try opening terminal and performing a git status command, make sure you change directory to the appropriate file location. Then either add or remove the conflicting branches.