Re: git checkout problem

2013-02-23 Thread Andreas Schwab
J.V. jvsr...@gmail.com writes: Now am trying to go back to my master branch and get: error: The following untracked working tree files would be overwritten by checkout: lib/derbyclient.jar Please move or remove them before you can switch branches. Aborting When in doubt, try

git checkout problem

2013-02-22 Thread J.V.
I was on my master branch, I checked out a branch (origin/somebranch), did nothing, made no updates but did a few git pulls over about a week; made a small change to one file comitted pushed. Now am trying to go back to my master branch and get: error: The following untracked working tree