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