Re: stuck and need unstuck (git checkout)

2013-03-30 Thread Phil Hord
On Mon, Mar 25, 2013 at 1:57 PM, J.V.  wrote:
> I was on a branch (local tracked with remote), and I wanted to checkout a
> remote branch so did:
> $git co myRemoteBranch
>
> and got a message that a lot of jar files were being untracked (files were
> locked).  I had a server running that had some of the jar files locked, so
> it could not update and untracked them all.
>
> What I want to do now is:
> 1. switch branches
> 2. delete this locally created branch
> 3.  re-check out again so all will be well.
>
> I cannot switch branches because it says my untracked files will be
> overwritten.  How do I switch branches? I have no commits to make and simply
> want to go back.  git reset and git stash do not get me there.

Does 'git checkout --force yourLocalBranch' help?

Phil
--
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


stuck and need unstuck (git checkout)

2013-03-25 Thread J.V.
I was on a branch (local tracked with remote), and I wanted to checkout 
a remote branch so did:

$git co myRemoteBranch

and got a message that a lot of jar files were being untracked (files 
were locked).  I had a server running that had some of the jar files 
locked, so it could not update and untracked them all.


What I want to do now is:
1. switch branches
2. delete this locally created branch
3.  re-check out again so all will be well.

I cannot switch branches because it says my untracked files will be 
overwritten.  How do I switch branches? I have no commits to make and 
simply want to go back.  git reset and git stash do not get me there.


thanks

J.V.
--
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