Failed to merge due to conflict with UserInterfaceState.xcuserstate

Question

I created a branch and made a bunch of changes. I made the changes and then archived the changes. Then I switched to the master branch and tried to merge. He said that I had unforeseen changes. So I made a commit on the main branch to see what she was talking about. He said that there is a file called UserInterfaceState.xcuserstate that has been modified. So I made a change (not sure what the change is). Then I tried to merge again. He then opens the merge window and indicates that there is a conflict with UserInterfaceState.xcuserstate. Therefore, I returned to the branch and found that the same file now needs to be completed. This was not the case before. So I did this and returned to the master branch. Again I tried to merge, but could not because of incomplete changes. Undoubtedly, UserInterfaceState.xcuserstate needs to be done again. I did this and tried to merge. Same problem with conflict. His vicious circle.

What is this file and how to resolve the conflict? It does not appear in the project navigation window. Also, it is not on the unix file system. I am completely stuck. Suggestions? I am using xcode 4.5.2

Answer 1

UserInterfaceState.xcuserstate is where Xcode saves your GUI states, such as window positions, open tabs, extended nodes in the project inspector, etc.

Simply resizing the Xcode window will cause this file to change and be marked as resized by your version control system. You can force your SCM system to ignore certain files that are not important to the project itself.

Git: Git ignore file for Xcode projects
Subversion: SVN ignore template with Xcode 4

Answer 2

just delete files using

git rm --cached * xcuserstate

then do local commit by selecting .DS_Store with a different message

discard all other changes

to pull

push

done :)