Eclipse: Can't switch branch in Git due to "Checkout conflicts" -


whenever try switch git branch in eclipse error occurs:

"checkout conflicts" appears

neither stashing or resetting conflicts solves problem. window disappears , comes seconds later.

when pressing on cancel window disappears permanently branch won't switched then.

i don't want check in .project file. disabling build automatically in eclipse doesn't work either. behaviour occurs in both luna , mars.

how can solve problem?

you should add file ignore list won't affected incoming commits. should have in .gitignore

target/ .settings .classpath .project 

Comments