Cannot Merge due to conflict with UserInterfaceState.xcuserstate

xcode commit merge-conflict-resolution
JeffB6688 picture JeffB6688 · Dec 14, 2012 · Viewed 18k times · Source

I created a branch and made a bunch of changes. I committed the changes and then archived the changes. Then I switched to the master branch and tried to do a merge. It said I had uncommitted changes. So I did a commit on the master branch to see what it was talking about. It said that there is a file called UserInterfaceState.xcuserstate that was modified. So I committed the change (not sure what the change was). Then I tried to merge again. It then opens up a merge window and indicates that there is a conflict with UserInterfaceState.xcuserstate. So I went back to the branch and found that that same file is now needing to be committed. This did not show up before. So I committed it and went back to the master branch. Again I tried to merge but cant because of uncommitted changes. Sure enough, UserInterfaceState.xcuserstate is once again needing to be committed. I committed it and tried to merge. Same problem with conflict. Its a vicious circle.

What is this file and how do I resolve the reported conflict. It does not show up in my project navigation window. Furthermore, it is not in the unix file system. I am totally stuck. Suggestions? I am using xcode 4.5.2

Answer

Ankit Sachan picture Ankit Sachan · Jul 7, 2014

just remove files using

git rm --cached *xcuserstate

then do a local commit selecting .DS_Store with miscellaneous message

discard all other changes

pull

push

done :)

Related questions

How to restore previous version of code in Xcode

I'm working on an Objective C project in Xcode and need to restore to a previous version that was committed in source control. How do I do that? I can find information on how to commit and push but no …

Read More
What is "UserInterfaceState.xcuserstate" file in Xcode project?

I use svnX. When importing project, I check "no ignore" option. (for importing libOAuth.a, ...) But one file is causing a small problem. UserInterfaceState.xcuserstate What is this file? Can I ignore this file? Is it important? Should I commit …

Read More
XCode: Commit failed in SVN : No space left on device

Hi, I am committing my project in SVN using XCode. I do it successfully for quite a few months. But suddenly today, while committing, it is showing the following error : The working copy "Classes" failed to commit files. svn: Commit …

Read More