search

simonwagner / mergepbx

script for merging XCode project files in git
GNU General Public License v3.0
1.04k stars 46 forks source link

merging failed: can not merge projects with objectVersion 47 #27

Open JamesPerlman opened 7 years ago

JamesPerlman commented 7 years ago

When the pbxproj has objectVersion = 47, this merge tool does not work :(

It returns with this message: merging failed: can not merge projects with objectVersion 47 PROJECT.xcodeproj/project.pbxproj seems unchanged. Was the merge successful? [y/n]

simonwagner commented 7 years ago

Which version of Xcode are you using?

JamesPerlman commented 7 years ago

Now I am using Xcode Version 8.3.3 (8E3004b)

simonwagner commented 7 years ago

Can you try, whether it works with the version in branch https://github.com/simonwagner/mergepbx/branch/objectVersion-47?

It seems the project format has been changed by Apple, but no idea what they changed.

So I just claim to support the new version, let's see what breaks.

pgrosslicht commented 7 years ago

I just tried it and it did not work for me. Also on 8.3.3.

/usr/bin/mergepbx/pbxproj/merge/pbxmerge.py:177: UserWarning: Support for object version 47 is still experimental
merging failed: can't merge attributes, conflicting values in dictionary: set([u'TargetAttributes'])
falling back to 3-way text merge for Xcode project file...
simonwagner commented 7 years ago

@pgrosslicht This is a different problem, this issue is about the missing support for object version 47, yours seems to be caused by non mergeable changes in the project file.

I would need to have a look at your project file to determine if this is really a bug or really just unmergeable changes. Most likely it is the latter.