I have been looking for an answer about merge conflicts with project.pbxproj files for a long time. My merge conflicts occur mostly with Cocoapods. It seems that if I add a block to a branch, then try to merge it into another, many merge conflicts arise in the project.pbxproj file of my Pods project. I would just go over and fix these conflicts manually, but there are many ways to make this reasonable. Has anyone else encountered this problem and found a reasonable solution. This problem has attacked me now, and I ask this question only as a last resort. After creating several new features on separate branches, the problem of including them in my project is very frustrating. Any help would be very much appreciated.
source share