How to resolve conflicts about project.pbxproj in Xcode using git?

Question

I always solved this problem using the directory structure of other members, which takes precedence, and then I confirm that you have no conflicts and corrections in the directory structure in which I want.

So, I want to know that there are conflicts in the project.pbxproj file, how to solve it using another best way?

Answer 1

Usually you just want to accept both sides of the merge (people added different files) and that’s it.

After that, if your file is still “ damaged ”, in most cases the problem arises due to the incorrect format after merging, the most common scenarios are:

• missing comma
• duplicate statements

This is very easy to fix if you know what you are looking for.

You can use syntax checking to check project.pbxproj file, I use Kin and it works like a charm. It will analyze your project configuration file and error detection.

---

Example (using KIN)

If your project file is damaged, you can leave something like this:

And if your diffs in the file are too many ... it can be quite difficult to find an error ... now , after using KIN, you can go from problem to solution in the shortest possible time.