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

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.