Xcode project files are complex and not meant to be human-readable, so they can be scary to merge. When there’s a conflict, it’s never fun.

The tool Kintsugi intends to automatically solve these conflicts for you “99.9% of the time.”

👉Automatically merging conflicts in Xcode project files | github

The name Kintsugi (金継ぎ) is well-chosen, meaning “the art of repairing broken pottery by mending it with gold.” 🤯

Another interesting note: this project relies on a framework called Xcodeproj that lets you create and modify Xcode project files automatically. That sounds likes a better alternative than a homespun shell script. 👍

via iOS Dev Weekly