From: "J.V." <jvsrvcs@gmail.com>
To: "git@vger.kernel.org" <git@vger.kernel.org>
Subject: git checkout problem
Date: Fri, 22 Feb 2013 17:30:29 -0700 [thread overview]
Message-ID: <51280DA5.800@gmail.com> (raw)
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 reply other threads:[~2013-02-23 0:30 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-02-23 0:30 J.V. [this message]
2013-02-23 8:19 ` git checkout problem Andreas Schwab
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=51280DA5.800@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).