From: "J.V." <jvsrvcs@gmail.com>
To: "git@vger.kernel.org" <git@vger.kernel.org>
Subject: problem switching branches
Date: Tue, 26 Feb 2013 16:08:55 -0700 [thread overview]
Message-ID: <512D4087.5070504@gmail.com> (raw)
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 reply other threads:[~2013-02-26 23:09 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-02-26 23:08 J.V. [this message]
2013-02-27 5:17 ` problem switching branches Jeff King
2013-03-01 20:52 ` J.V.
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=512D4087.5070504@gmail.com \
--to=jvsrvcs@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).