{"thread":{"id":"32983","subject":"git checkout problem","startedAt":"2013-02-23T00:30:29Z","lastAt":"2013-02-23T08:19:07Z","messageCount":2,"participants":["J.V.","Andreas Schwab"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"210079","messageId":"51280DA5.800@gmail.com","threadId":"32983","inReplyTo":null,"subject":"git checkout problem","fromName":"J.V.","fromEmail":"jvsrvcs@gmail.com","sentAt":"2013-02-23T00:30:29Z","receivedAt":"2013-02-23T00:30:29Z","isPatch":false,"sender":{"key":"jvsrvcs@gmail.com","avatar":null},"body":"I was on my master branch, I checked out a branch (origin/somebranch), \ndid nothing, made no updates\nbut did a few git pulls over about a week; made a small change to one \nfile & comitted & pushed.\n\nNow am trying to go back to my master branch and get:\n\nerror: The following untracked working tree files would be overwritten \nby checkout:\n         lib/derbyclient.jar\nPlease move or remove them before you can switch branches.\nAborting\n\n\nI did not put that file there, how do I get back to my master branch?  I \ndo not want to muck up\nthe branch that I am now one.  Obviously someone put derbyclient.jar \nthere, not sure, but it is\nsupposed to be there so do not want to remove.\n\nany ideas?\n"},{"id":"210084","messageId":"m238wn5tok.fsf@igel.home","threadId":"32983","inReplyTo":"51280DA5.800@gmail.com","subject":"Re: git checkout problem","fromName":"Andreas Schwab","fromEmail":"schwab@linux-m68k.org","sentAt":"2013-02-23T08:19:07Z","receivedAt":"2013-02-23T08:19:07Z","isPatch":false,"sender":{"key":"schwab@linux-m68k.org","avatar":"https://avatars.githubusercontent.com/u/2175493?v=4"},"body":"\"J.V.\" <jvsrvcs@gmail.com> writes:\n\n> Now am trying to go back to my master branch and get:\n>\n> error: The following untracked working tree files would be overwritten by\n> checkout:\n>         lib/derbyclient.jar\n> Please move or remove them before you can switch branches.\n> Aborting\n\nWhen in doubt, try running \"git status\".  What does it say?\n\nAndreas.\n\n-- \nAndreas Schwab, schwab@linux-m68k.org\nGPG Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5\n\"And now for something completely different.\"\n"}]}