I can't checkout other branch in git

Question

Error

I got error

error: The following untracked working tree files would be overwritten by checkout:
MyProject/xcuserdata/shingo.nakanishi.xcuserdatad/UserInterfaceState.xcuserstate
Please move or remove them before you can switch branches.
Aborting

I try this

(The following untracked working tree files would be overwritten by checkout)

git rm --cached MyProject/xcuserdata/shingo.nakanishi.xcuserdatad/UserInterfaceState.xcuserstate

and

git clean -d -fx ""

git commit -a

git push

When 「UserInterfaceState.xcuserstate」file is not exist, this is work

But Xcode soon make UserInterfaceState.xcuserstate.

When I use Xcode, Xcode make UserInterfaceState.xcuserstate file.

So, Each checkout branch , I must do git clean -d -fx "" each Time.

My ~/.gitignore

this is my ~/.gitignore

.DS_Store
*UserInterfaceState.xcuserstate
*Breakpoints.xcbkptlist

How to ignore the file?

score 0 · Answer 1 · answered Feb 01 '13 at 07:28

0

the first error means it is already in your repository (committed). you need to first remove it from the repository, then ignore it.

answered Feb 01 '13 at 07:28

Dyno Fu

8,753
4
39
64

I'm sory, I forgot write `git commit -a` and `git push`. I think the file deleted from repository – shingo.nakanishi Feb 01 '13 at 07:35

score 0 · Answer 2 · edited May 23 '17 at 12:04

0

please read Git ignore file for Xcode projects

https://gist.github.com/3786883

Please search the SO before post questions.

For the change you have made. use git checkout -- <fileName> to discard changes.

edited May 23 '17 at 12:04

Community

1
1

answered Feb 01 '13 at 07:38

Kyle Fang

1,139
6
14

score 0 · Answer 3 · answered Feb 01 '13 at 07:38

0

Git doesn't ignore the files you already tracked. So just remove that file from git first

git rm -rf file 
git commit -m "remove"
git push origin #{branchname}

and after, you're .gitignore will ignore it :)