How to compare/merge between XIB files?
<p>I have these two XIB files. The first one edited by my friend to add features and to other one edited by my self and add another features. My problem is how can i merge the two files? I know that XIB files are XML based and I can use some compare tools to merge it. But I think there will be some conflicts. What is the best way to compare or merge between XIB files?</p>

<p>Thanks a lot guys.
sasayins</p>
