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?

  • How can I save an incompletely merged index in git?
  • git push -f: How to make sure other people catch up?
  • Upload my project to github
  • Does picking a range of commits with cherry-pick or rebase --onto end up with the same result?
  • Git - Different Remote for each Branch
  • Git excludesfile for a branch
  • Better control of git log formatting
  • Git/Django: Granular code permissioning/availability
  • How do I split up a django project into seperate already created applications?
  • Git submodules: Is it possible to notify other developers of a change?
  • SSH config with multiple keys for multiple gitlab user accounts
  • How can I know the location from where I cloned my git repository
  • 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.

    Git Baby is a git and github fan, let's start git clone.