git/list[1] front-page[2] threads[3] people[4] search[5] about
 

problem switching branches

From
JJ.V. <jvsrvcs@gmail.com>
Date
Feb 26, 2013, 23:08 UTC
Message-ID
<512D4087.5070504@gmail.com>

I was on my master branch, I then checked out a branch ( origin/somebranch ), made no updates but did a few git pulls on the branch over about a week; then made a small change to only a single file & committed & 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 jar file there (I edited a single config file), how do I now get back to my master branch?

I do not want to muck up the branch that I am now on by deleting anything. Any ideas how this happened?

Obviously someone put derbyclient.jar there, not sure, but it is supposed to be there so do not want to remove as advised.

any ideas on how I can get back to my master branch and get out of this?
Next: Jeff King
Message 1 of 3 in “problem switching branches”
  1. J.V.Feb 26, 2013
  2. Jeff KingFeb 27, 2013
  3. J.V.Mar 1, 2013

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.