简体   繁体   English

故事板中发生冲突时,Xcode崩溃

[英]Xcode crashes when there is conflict in storyboard

I committed my changes to git and then asked my teammate to pull from the repository. 我将更改提交到git ,然后要求队友从存储库中提取。 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. 如果他单击情节提要文件以解决该问题,则Xcode崩溃。

Are we doing something wrong here or is Xcode just really buggy? 我们在这里做错什么了吗,还是Xcode确实是越野车?

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. 好吧,XCode 4确实是错误的,但是如果存在git冲突,则该文件可能处于与冲突/合并有关的怪异状态。 Try to resolve that first then reload the storyboard and see what happens. 首先尝试解决该问题,然后重新加载情节提要,然后看看会发生什么。

声明:本站的技术帖子网页,遵循CC BY-SA 4.0协议,如果您需要转载,请注明本站网址或者原文地址。任何问题请咨询:yoyou2525@163.com.

 
粤ICP备18138465号  © 2020-2024 STACKOOM.COM