# git checkout problem 2 messages from 2013-02-23 to 2013-02-23. Participants: J.V., Andreas Schwab. Thread: https://gitlist.dev/t/32983 ## J.V., 2013-02-23 00:30 Subject: git checkout problem Message-ID: <51280DA5.800@gmail.com> URL: https://gitlist.dev/e/51280DA5.800%40gmail.com ``` 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 files would be overwritten by checkout: lib/derbyclient.jar Please move or remove them before you can switch branches. Aborting I did not put that file there, how do I get back to my master branch? I do not want to muck up the branch that I am now one. Obviously someone put derbyclient.jar there, not sure, but it is supposed to be there so do not want to remove. any ideas? ``` ## Andreas Schwab, 2013-02-23 08:19 Subject: Re: git checkout problem Message-ID: URL: https://gitlist.dev/e/m238wn5tok.fsf%40igel.home In-Reply-To: <51280DA5.800@gmail.com> ``` "J.V." 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 running "git status". What does it say? Andreas. -- Andreas Schwab, schwab@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 "And now for something completely different." ```