Menu
Our project use svn to manage source version. We have a problem that when a xib is modified by 2 person, it will almost conflict after merging. I've open the confilct file using vim, the information is not readable and I don't know how to solve the merge conflict.
Has anyone met this problem before? How to solve it?
Thanks in advance.
970
asked Apr 07 '12 15:04
The xib is xml file. You can open it with TextEdit. app and search for "<<<" You will see two blocks, mine and the revision from svn. If it's not possible you would revert your code, update and redo the work.
Developers should evaluate if they actually made a change to a storyboard, and only include it in the commit if they did. If a merge conflict of this type is encountered, the simplest approach is to review the conflicts, and if they are minor layout adjustments, select the newest change to resolve the conflict.
I would first check if it's possible to manually merge it. The xib is xml file. You can open it with TextEdit.app and search for "<<<" You will see two blocks, mine and the revision from svn.
If it's not possible you would revert your code, update and redo the work. And there are a few other ways to resolve it. How to merge conflicts (file project.pbxproj) in Xcode use svn?
92
If you love us? You can donate to us via Paypal or buy me a coffee so we can maintain and grow! Thank you!
Donate Us With
