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 do I apply rejected hunks after fixing them?
  • How do I git clone --recursive and checkout master on all submodules in a single line?
  • Remove files from master at github
  • Releasing a multi-module Maven project hosted in single Git repository
  • How does GitHub handle push security?
  • clone parts of a github project
  • Git remote url with username in form of email address
  • graphs for changes amount of git repo
  • git push fatal: unable to create thread: Resource temporarily unavailable
  • Git Cherry-Pick
  • Create a local Git repo on Ubuntu box
  • Git integration with my Java EE application
  • 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.