Handling Git conflicts when merging Xcode projects
Whenever I work on an iOS project with multiple developers working in parallel, I tend to have to spend a lot of time manually merging Xcode project files. This is a long-known issue with the Xcode project file format*. Listing all the project files in the .xcodeproj file causes conflicts that often cannot be merged automatically:
Use .gitattributes to treat as binary / merge (corrupts xcodeproj occasionally)
FB Bug report
After discussing this in a WWDC Lab in 2020, I filed a Feedback with Apple for this issue and posted on the Apple Developer Forums about this.