Cannot Merge due to conflict with UserInterfaceState.xcuserstate

Question

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 ha

Answer 1

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 :)

Answer 2

I tried all the commands does not help. So i thought to delete in directory.

Right Click on xcode Project File -> Show Package Contents -> project.xcworkspace -> Right Click on xcworkspace File -> Show Package Contents -> xcuserdata -> mac"mac is an system name".xcuserdatad -> UserInterfaceState.xcuserstate -> Delete your headache here i mean UserInterfaceState.xcuserstate file.

then commit using commands and do as usual procedure.

Answer 3

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

Simply resizing the Xcode window will cause this file to change and be flagged as modified by your source control system. You can make your SCM system ignore specific files that are not important to the project itself.

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