This document discusses resolving conflicts that occur when merging Xcode projects managed with Git. It explains that Xcode-generated *.pbxproj files often cause opaque conflicts. Two approaches are presented: using Git to automatically merge the files or using Xcode to manually resolve them. The recommended approach is to clear the Xcode project structure, use Git to check out changes with higher priority, and drag folders back into Xcode to rebuild the project files. Creating automation scripts could further improve resolving these merge conflicts.