Couldn't open xib file after git pull, invalid element name

Question

I am working on project with another developer. We are working on bitbucket.

The problem is he made a changes in XIB files. After that when I do a git pull, I receive the changes but get an error on XIB files. When I tried to open it, a show alert message saying could not opened

Line 81 startTag: invalid element name.

Thanks :)

Answer 1

Glad you corrected the issue. I recently ran into the same issue. It a merge conflict and that is why Xcode is throwing that error. Within the .xib file you will see something like:

<<<<<<< HEAD  // code  =======  // code  >>>>>>> apps 

You can do what you did above, or manually correct the merge conflict issues by opening the .xib file in a text editor. After correcting it the file should open fine in Xcode.

Answer 2

All you have to do is find the <<<<<<< HEAD lines and delete them. Compiled on my first try. For some reason they are inserted into the .xib file when you have a merge conflict.