Merging fails with: merging failed: u'PBXAggregateTarget'

[vhbit]

Let me know how I can provide more detailed and helpful info

[simonwagner]

You can send your project file to [email protected].

It would be best, if you created a dump of the merge. See
#6 (comment) for
how to do that.
Am 04.09.2015 12:28 nachm. schrieb "Valerii Hiora" <[email protected]

:

Let me know how I can provide more detailed and helpful info

—
Reply to this email directly or view it on GitHub
#14.

[lumaxis]

@simonwagner I'm seeing the exact same issue. Can you quickly reiterate how to use the dump option? Because I'm getting this error message when trying as you explained in the other issue:

Normal merge conflict for 'project.pbxproj':
  {local}: modified file
  {remote}: modified file
usage: mergepbx [-h] [-o OUTPUT] [-d] [--dump DUMP] [--clean] [--no-clean]
                base mine theirs
mergepbx: error: argument --dump: expected one argument

Thanks!

[simonwagner]

You need to place the file path where you want the dump to be written to after --dump. (That’s why it says „expected one argument“). So for example: „—dump /tmp/mergepbxdump.zip“ will write the file to „/tmp/mergepbxdump.zip“.

Am 11.09.2015 um 14:35 schrieb Lukas Spieß [email protected]:

@simonwagner https://github.com/simonwagner I'm seeing the exact same issue. Can you quickly reiterate how to use the dump option? Because I'm getting this error message when trying as you explained in the other issue:

Normal merge conflict for 'project.pbxproj':
{local}: modified file
{remote}: modified file
usage: mergepbx [-h] [-o OUTPUT] [-d] [--dump DUMP] [--clean] [--no-clean]
base mine theirs
mergepbx: error: argument --dump: expected one argument
Thanks!

—
Reply to this email directly or view it on GitHub #14 (comment).

[lumaxis]

Perfect, thanks. I just emailed you the dump ☺️

[simonwagner]

Thanks, I will take a look at it in the evening after work.

Am 11.09.2015 um 14:46 schrieb Lukas Spieß [email protected]:

Perfect, thanks. I just emailed you the dump

—
Reply to this email directly or view it on GitHub #14 (comment).

[lumaxis]

Any updates on this? Would love to start using mergepbx in more projects :)

[simonwagner]

Working on it, unfortunately it's not only the missing entry for PBXAggregateTarget (that is an easy fix), but I also need to implement an algorithm for merging the compiler flags (which is a list and I have until now only implemented an algorithm for sets - list are unfortunately more difficult for a 3-way merge)

[snej]

I'm running into this too :( It'd be great to get a fix... until then I'll try using the 'union' merge as you suggested.

[kcormier]

@simonwagner Is there any update on this?

[mrtj]

It would be nice if the tool would not fail at least when the PBXAggregateTarget sections are exactly the same