Xcode merge branch,remind tree conflict when add some new file
I create a branch2 and add some new class file,when i merge into master branch,Xcode reminds us:“The files ViewModel.h,ViewModel.m had a tree conflict”
If I just edit some code but not add new file,it will be ok,but how should i solve this problem?
One Solution collect form web for “Xcode merge branch,remind tree conflict when add some new file”
Change to your master branch, and then use the option “Merge from branch”, and select your branch2.