Xcode crashes when there is conflict in storyboard

Question

I committed my changes to git and then asked my teammate to pull from the repository. When he did a pull, it showed a conflict with storyboard. If he clicks on the storyboard file in order to resolve it, Xcode crashes.

Are we doing something wrong here or is Xcode just really buggy?

Answer 1

Well, XCode 4 is really buggy, but if there was a git conflict then the file may be in a weird state related to the conflict/merge. Try to resolve that first then reload the storyboard and see what happens.