simonwagner / mergepbx

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

Xcode 8.1 crashes when mergepbx resolves conflicts #23

Open ky1ejs opened 7 years ago

ky1ejs commented 7 years ago

What debug information can I get for you, I don't really know where to start with mergepbx? 😄

The conflict was on a group that had been moved to different positions on two branches.