如何解决关于project.pbxproj在Xcode中使用git的冲突？

Question

I always solved this problem by using directory structure of the other members shall prevail ,and then confirm don't have any conflicts and mend it to what directory structure I want.

So, I want to know, the project.pbxproj file have conflicts, how to solve it through other best way?

Answer 1

Normally, you simply want to accept both sides of the merge (people added different files) and that's all.

After that, if your file is still ' corrupted ', in most cases the problem is due to a wrong format after merge, most common scenarios are:

• missing a comma
• duplicated statements

It's very easy to fix if you know what you are looking.

You can use a syntax checker to verify the project.pbxproj file, I use Kin and it works like a charm. It will parse your project configuration file and detect errors.

---

For Example (Using KIN)

If your project file gets corrupted you can be left with something like this:

And if your diffs on the file are far too much.. it can be quite challenging to find the error... now , after using KIN you can go from problem to solution in no time .