StackOverflow2013

Note that there are some explanatory texts on larger screens.

plurals

PO
text
Body
copied!<blockquote> <p>What if I, for example, have a tab view with three tabs in one branch, and a tab view with three tabs in the other, and two of the tabs are the same, and one is not, will i get a four-tabbed tab view after the merge</p> </blockquote> <p>You will most likely have <a href="http://www.kernel.org/pub/software/scm/git/docs/user-manual.html#resolving-a-merge" rel="nofollow noreferrer">a conflict</a>, if the <em>modified</em> lines (involved in the tab definitions) are the same.<br> You will have 4 tabs only if, during the manual merge resolution, you mistakingly leave an extra tab definition.</p> <p>See <a href="http://blog.wuwon.id.au/2010/09/painless-merge-conflict-resolution-in.html" rel="nofollow noreferrer">Painless Merge Conflict Resolution in Git</a> for a great article on merge resolution.</p> <p><img src="https://i.stack.imgur.com/k9GB2.png" alt="3-way merge"></p> <hr> <p>That being said, regarding <strong><a href="http://en.wikipedia.org/wiki/Interface_Builder" rel="nofollow noreferrer">xibs</a></strong> specifically, its presentation seems good:</p> <blockquote> <p>As of Interface Builder version 3, a new file format (with extension <code>.xib</code>) has been added, which is functionally identical to <code>.nib</code>, except it is stored in a flat file, making it more suitable for storage in revision control systems and processing by tools such as diff.</p> </blockquote> <p>But <a href="http://www.cocoabuilder.com/archive/cocoa/229673-quicktime-movie-view-error.html" rel="nofollow noreferrer">this thread</a> summarizes the actual feeling:</p> <blockquote> <p>How is Git able to merge changes to XIBs?<br> The structure of an XIB isn't linear; there's no guarantee that you can just swap out portions of an XIB and wind up with a usable XIB.<br> Unless Git has an understanding of XIBs near Apple's, I don't see how merging could be guaranteed to work.</p> </blockquote> <p>That would leave you with the extra step, before adding your merge resolution in case of conflict, to open the modified <code>.xib</code> file in your XCode4 editor and check if everything still looks good.</p> <p><img src="https://i.stack.imgur.com/U5Bq4.jpg" alt="XCode4 xib file Editor"></p> <p>Once that visual check is done, <a href="http://progit.org/2010/03/08/rerere.html" rel="nofollow noreferrer">record the merge resolution through <strong><code>rerere</code></strong></a>, and you will <a href="https://stackoverflow.com/questions/3283670/have-git-rerere-automatically-mark-files-as-resolved">have potentially automatic resolution</a> in the future.</p>

Querying!

Guidance

An individual column

Larger individual text columns get their own page to allow for proper reading.

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