5
我已经尝试合并我的Git
存储库上的两个分支,并在我的Storyboard
文件中发生了一些冲突。下面是冲突行:Git冲突导致故事板问题
<resources>
<image name="IconAddToCart" width="30" height="34"/>
<<<<<<< HEAD
<image name="IconAddToCart" width="30" height="34"/>
=======
<image name="IconCartBig" width="149" height="111"/>
>>>>>>> 0133fd1364e6e590034bba1c0e32273bcf22a3d2
<image name="IconCheckmark" width="13" height="13"/>
<image name="LoginBackground" width="320" height="568"/>
<image name="LoginBackground" width="320" height="568"/>
<image name="LoginLogo" width="257" height="73"/>
<image name="ScanButton" width="178" height="61"/>
</resources>
<color key="tintColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<simulatedMetricsContainer key="defaultSimulatedMetrics">
<simulatedStatusBarMetrics key="statusBar"/>
<simulatedOrientationMetrics key="orientation"/>
<simulatedScreenMetrics key="destination" type="retina4"/>
</simulatedMetricsContainer>
<inferredMetricsTieBreakers>
<segue reference="rCk-dF-YMq"/>
<segue reference="SKx-bH-AaC"/>
<segue reference="ofx-gD-lnj"/>
<segue reference="Eo1-ee-RYE"/>
<segue reference="mb5-Kc-qz1"/>
<segue reference="qYH-kM-beE"/>
<segue reference="QOW-kb-Y6W"/>
<<<<<<< HEAD
<segue reference="vKq-do-lYa"/>
=======
<segue reference="CgX-ql-qnP"/>
<segue reference="gwc-Z9-zHd"/>
>>>>>>> 0133fd1364e6e590034bba1c0e32273bcf22a3d2
</inferredMetricsTieBreakers>
我试着通过删除被复制的代码行,并删除冲突标记固定的冲突,这是文件的一部分,现在的样子:
<resources>
<image name="IconAddToCart" width="30" height="34"/>
<image name="IconCartBig" width="149" height="111"/>
<image name="IconCheckmark" width="13" height="13"/>
<image name="LoginBackground" width="320" height="568"/>
<image name="LoginBackground" width="320" height="568"/>
<image name="LoginLogo" width="257" height="73"/>
<image name="ScanButton" width="178" height="61"/>
</resources>
<color key="tintColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<simulatedMetricsContainer key="defaultSimulatedMetrics">
<simulatedStatusBarMetrics key="statusBar"/>
<simulatedOrientationMetrics key="orientation"/>
<simulatedScreenMetrics key="destination" type="retina4"/>
</simulatedMetricsContainer>
<inferredMetricsTieBreakers>
<segue reference="rCk-dF-YMq"/>
<segue reference="SKx-bH-AaC"/>
<segue reference="ofx-gD-lnj"/>
<segue reference="Eo1-ee-RYE"/>
<segue reference="mb5-Kc-qz1"/>
<segue reference="qYH-kM-beE"/>
<segue reference="QOW-kb-Y6W"/>
<segue reference="vKq-do-lYa"/>
<segue reference="CgX-ql-qnP"/>
<segue reference="gwc-Z9-zHd"/>
</inferredMetricsTieBreakers>
即使在那之后,编译器仍然给了我以下错误:The document "Main.storyboard"could not be opened. The operation couldn't be completed. (com.apple.InterfaceBuilder error -1.)
是一个什么错误的原因,如果我已经删除这些行?
看看http://stackoverflow.com/questions/12725116/the-document-mainstoryboard-storyboard-could-not-be-opened – Chiron
除了最后一个答案... XIB的文件不能是由两个人同时编辑,所以当你尝试合并你的文件时会说不能打开。合并XML文件(这就是XIB文件的末尾)是一件很痛苦的事,你知道是什么。所以,我的建议是,你要协调谁来接触每个XIB文件。 –
此行重复:' '。 Xcode 5可以修复这个问题(并告诉你这可能是因为SCM合并而发生的),但是也许你使用了旧版本的Xcode,这可能无法解决这个问题。 –
Vili