Question

I just made tried to do git checkout master and I got this error:

macoss-MacBook-Pro-10:Marketing owner12$ git checkout master
error: The following untracked working tree files would be overwritten by checkout:
    Marketing.xcodeproj/project.xcworkspace/xcuserdata/owner12.xcuserdatad/UserInterfaceState.xcuserstate
Please move or remove them before you can switch branches.
Aborting

but I am not sure how to handle this situation. I don’t mind having this file overwritten by what is in the repo. What is the correct way for me to proceed here?

Thanks!

Answer 1

You have files that are not being tracked. Either

rm untracked.file1 untracked.file2

or

git add . && git commit -m "adding new previously untracked files that serve a purpose"

if you’re having permission issues:

git add --ignore-errors .