search

simonwagner / mergepbx

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

Merge fails on "currentVersion" #18

Closed jadar closed 8 years ago

jadar commented 8 years ago

I have a project which had a new data model created on both branches. When we try to merge using the tool, it fails on the XCVersionGroupMerger3. Specifically the isa, "XCVersionGroup," with "currentVersion" and "children" conflicting. mytraps_fixreleaes_ _vim_mytraps_xcodeproj_project_pbxproj_ _vim_mytraps_xcodeproj_project_pbxproj_ _solarized_dark_ansi_ _259x60 screen_shot_2015-12-08_at_10_28_51_pm

simonwagner commented 8 years ago

Hm, well that is kinda a "real" merge conflict. mergepbx sees that the currentVersion has diverged in both branches and so they conflict on currentVersion. (Because what should it be? 16A9... or E9BD...)

mergepbx could solve it by noticing that there are two entries for files with different IDs but the same path and then just remove the superfluous file entry and replace its ID with the ID of the remaining entry. I am unsure whether that will be save enough to implement as a default behaviour.

Hm, so I would say, mergepbx is doing what it should - but lets see maybe I will add a --dangerously-merge-duplicate-file-entries. But for now it's working as intended.