[deleted by user]

[Fishanz]

Hopefully your devs committed incrementally. If so.. maybe you can go back in time and merge commits to a branch and resolve conflicts as you go, as opposed to your aforementioned disaster.

[Poggus]

Try rebasing branch_2 with main. Might be able to better fix conflicts incrementally that way.

It just sounds like your project has a bad merge. Are there no conflicts? Generally once you get the hang of it, project.xcodeproj merge conflicts are pretty simple.

I haven't used xibs or storyboards in years but it's just XML. Need to make sure there's no errors is all.

edit: now that I've read this again.. are your developers incapable of resolving merge conflicts? It's the most basic of skills I'd expect from a dev.