Previously I complained that the <inferredMetricsTieBreakers> section of a storyboard could be quite a pain to merge. Recently when dealing with a nasty merge, I discovered something quite useful:
If you can’t resolve the conflict yourself (or can’t be bothered to!), try deleting all the segues listed there. The Storyboard compiler appears perfectly happy with this (whereas if you try to leave some items be, it often complains they’re invalid), and when you next save in the editor, it’ll generate a fresh batch.
P.S. We’ve just admitted defeat and broken the giant storyboard apart a bit