CODEWITHSUNDEEP
iphonexcodemerge
Guy Ephraim
Guy Ephraim

Reputation: 3520

Duplicate file reference in project.pbxproj

Recently my development team grew and we started working on branches in SVN. if we add files to the project in two branches, and merge them afterwards, I can't open the project from xcode anymore. I did some investigation and found out that the project file uses hash for each node in the source tree, and when two files are added on a different branches they might have the same hash. It happens almost every merge we are doing.

How can I solve the issue?

Upvotes: 1

Views: 1050

Answers (1)

seobyeongky
seobyeongky

Reputation: 11

Unfortunately, You have to resolve pbxproj file manually. Or, You can use one of these build systems. (I recommand CMake beacuase it supports XCode)

Upvotes: 1

Related Questions