Databases
StackOverflow2013
Postsdbo
POGit conflicts causes Storyboard problems
 

Note that there are some explanatory texts on larger screens.

plurals
  1. POGit conflicts causes Storyboard problems
    primarykey
    data
    text
    <p>I've tried merging two branches on my <code>Git</code> repository and some conflicts occurred on my <code>Storyboard</code> file. Here are the conflicted lines:</p> <pre><code> &lt;resources&gt; &lt;image name="IconAddToCart" width="30" height="34"/&gt; &lt;&lt;&lt;&lt;&lt;&lt;&lt; HEAD &lt;image name="IconAddToCart" width="30" height="34"/&gt; ======= &lt;image name="IconCartBig" width="149" height="111"/&gt; &gt;&gt;&gt;&gt;&gt;&gt;&gt; 0133fd1364e6e590034bba1c0e32273bcf22a3d2 &lt;image name="IconCheckmark" width="13" height="13"/&gt; &lt;image name="LoginBackground" width="320" height="568"/&gt; &lt;image name="LoginBackground" width="320" height="568"/&gt; &lt;image name="LoginLogo" width="257" height="73"/&gt; &lt;image name="ScanButton" width="178" height="61"/&gt; &lt;/resources&gt; &lt;color key="tintColor" white="1" alpha="1" colorSpace="calibratedWhite"/&gt; &lt;simulatedMetricsContainer key="defaultSimulatedMetrics"&gt; &lt;simulatedStatusBarMetrics key="statusBar"/&gt; &lt;simulatedOrientationMetrics key="orientation"/&gt; &lt;simulatedScreenMetrics key="destination" type="retina4"/&gt; &lt;/simulatedMetricsContainer&gt; &lt;inferredMetricsTieBreakers&gt; &lt;segue reference="rCk-dF-YMq"/&gt; &lt;segue reference="SKx-bH-AaC"/&gt; &lt;segue reference="ofx-gD-lnj"/&gt; &lt;segue reference="Eo1-ee-RYE"/&gt; &lt;segue reference="mb5-Kc-qz1"/&gt; &lt;segue reference="qYH-kM-beE"/&gt; &lt;segue reference="QOW-kb-Y6W"/&gt; &lt;&lt;&lt;&lt;&lt;&lt;&lt; HEAD &lt;segue reference="vKq-do-lYa"/&gt; ======= &lt;segue reference="CgX-ql-qnP"/&gt; &lt;segue reference="gwc-Z9-zHd"/&gt; &gt;&gt;&gt;&gt;&gt;&gt;&gt; 0133fd1364e6e590034bba1c0e32273bcf22a3d2 &lt;/inferredMetricsTieBreakers&gt; </code></pre> <p>I've tried fixing the conflicts by removing the lines of code that are duplicated and and removing the conflict marks, and this is how that part of the file looks now:</p> <pre><code>&lt;resources&gt; &lt;image name="IconAddToCart" width="30" height="34"/&gt; &lt;image name="IconCartBig" width="149" height="111"/&gt; &lt;image name="IconCheckmark" width="13" height="13"/&gt; &lt;image name="LoginBackground" width="320" height="568"/&gt; &lt;image name="LoginBackground" width="320" height="568"/&gt; &lt;image name="LoginLogo" width="257" height="73"/&gt; &lt;image name="ScanButton" width="178" height="61"/&gt; &lt;/resources&gt; &lt;color key="tintColor" white="1" alpha="1" colorSpace="calibratedWhite"/&gt; &lt;simulatedMetricsContainer key="defaultSimulatedMetrics"&gt; &lt;simulatedStatusBarMetrics key="statusBar"/&gt; &lt;simulatedOrientationMetrics key="orientation"/&gt; &lt;simulatedScreenMetrics key="destination" type="retina4"/&gt; &lt;/simulatedMetricsContainer&gt; &lt;inferredMetricsTieBreakers&gt; &lt;segue reference="rCk-dF-YMq"/&gt; &lt;segue reference="SKx-bH-AaC"/&gt; &lt;segue reference="ofx-gD-lnj"/&gt; &lt;segue reference="Eo1-ee-RYE"/&gt; &lt;segue reference="mb5-Kc-qz1"/&gt; &lt;segue reference="qYH-kM-beE"/&gt; &lt;segue reference="QOW-kb-Y6W"/&gt; &lt;segue reference="vKq-do-lYa"/&gt; &lt;segue reference="CgX-ql-qnP"/&gt; &lt;segue reference="gwc-Z9-zHd"/&gt; &lt;/inferredMetricsTieBreakers&gt; </code></pre> <p>Even after that, the compiler still gives me the following error: <code>The document "Main.storyboard"could not be opened. The operation couldn't be completed. (com.apple.InterfaceBuilder error -1.)</code></p> <p>What can be the cause of the error, if I've already removed those lines?</p>
    singulars
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. PTQuestion
    1. This table or related slice is empty.
    1. USAndra Todorescu
    plurals
    1. PL
      singulars
      1. LTLinked
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. VO
      singulars
      1. POGit conflicts causes Storyboard problems
      1. This table or related slice is empty.
      1. VTUpMod
    1. COHave a look at http://stackoverflow.com/questions/12725116/the-document-mainstoryboard-storyboard-could-not-be-opened
      singulars
      1. POGit conflicts causes Storyboard problems
      1. USChiron
    2. COIn addition to the last answer...XIB's files can't be edited by two persons at the same time, so when you try to merge your files it will say that can't be opened. Merging XML's files (that's what a XIB file is at the end) is a pain in the you know what. So, my advice is that you coordinate who's going to touch each XIB file.
      singulars
      1. POGit conflicts causes Storyboard problems
      1. USSophy Swicz
 

Querying!

 
Guidance
A row detail

Detail views are divided into sections. All the information in the data section comes from columns in the selected row. The other sections display data from other, related rows.

Related data can be related in a to-one or a to-many fashion. Captions of data related in a to-many fashion link to a list view showing a filtered view of the table.

Try moving around until you find a non-empty to-many entry and click on the label to get to one. You can move back to the root by clicking on the database name in the header.

SQuiL has stopped working due to an internal error.

If you are curious you may find further information in the browser console, which is accessible through the devtools (F12).

Reload