Home/ Questions/Q 544457
In Process

The Archive Base Latest Questions

Editorial Team
  • 0
Asked: 2026-05-13T10:39:25+00:00

There are two members in our team. We use Xcode’s SCM (use SVN) to

  • 0

There are two members in our team. We use Xcode’s SCM (use SVN) to manger our source code files.
We all add files to our Xcode project. He has committed to SVN server. When I update, Xcode find there has conflicts in project.pbxproj file. Then I select quit Xcode and manually merge the conflicts. Then I start to edit my project.pbxproj, merge our changes. Actually I don’t know how Xcode manage files, I just add some text that my project.pbxproj file did’t have. When I finish, my project can’t open. I guess that because the project.pbxproj file can’t be edit by manual.

So, I want to know, when you find this problem, the project.pbxproj file have conflicts, how to solve it?

Thank you!

Share

Leave an answer

You must login to add an answer.

Need An Account,

1 Answer

  1. Editorial Team

    Unfortunately, there’s not much you can do except to make the changes manually in one check out and then check-in the newly “merged” project.

    • 0