For some large projects, when there are many developers involved in submitting code, there are often times when you need to deal with code conflicts. Regular code conflicts can be resolved by simply checking the logic with code snippets, while some file formats are poorly readable and can be troublesome to resolve, such as project.pbxproj in Xcode.

Kintsugi is a lightweight tool that automatically resolves conflicts in Xcode project files. Just install via gem:

gem install kintsugi

Then run the following command and kintsugi will help resolve the conflict, which is very convenient

kintsugi App/project.pbxproj

References:

Automatically merging conflicts in Xcode project files:

https://blog.kulman.sk/automatically-merge-xcode-project-conflicts/

Follow me on:

(Foks) Hui Wang's LinkedIn