How to solve xib file's merge conflict?

Question

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.

Why is the information 'unreadable'? A XIB file is just XML. Have you thought of transitioning to Git? It's automerge tools are far superior to svn. — Perception, Apr 07 '12 at 15:40
Did you try "updating it to the head" and then merging it again? — Parth Bhatt, Apr 07 '12 at 15:44

score 1 · Answer 1 · edited May 23 '17 at 12:22

1

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?

edited May 23 '17 at 12:22

Community

1
1

answered Apr 07 '12 at 18:45

user866650

19
1
4

score 0 · Answer 2 · answered Apr 07 '12 at 20:37

0

I confirm that just edit the file with a text editor ...

answered Apr 07 '12 at 20:37

WhiteTiger

1,691
1
18
23

How to solve xib file's merge conflict?

2 Answers2