Xcode merge branch, recall tree conflict when adding some new file

Question

I create branch2 and add a new class file, when I merge into the main branch, Xcode reminds us: "There was a tree conflict in the files ViewModel.h, ViewModel.m"
If I just edit the code but don’t add a new file, that will be fine, but how can I solve this problem?

Answer 1

Go to the main branch, and then use the Merge From Branch option and select your branch2.