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
Please move or remove them before you can switch branches.
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.
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html