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

git checkout problem

From
JJ.V. <jvsrvcs@gmail.com>
Date
Feb 23, 2013, 00:30 UTC
Message-ID
<51280DA5.800@gmail.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?
Next: Andreas Schwab
Message 1 of 2 in “git checkout problem”
  1. J.V.Feb 23, 2013
  2. Andreas SchwabFeb 23, 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.