threads / discuss / 33280

stuck and need unstuck (git checkout)

Subject: stuck and need unstuck (git checkout)

## tl;dr

2 messages between Mar 25, 2013 and Mar 30, 2013.

replies: 1people: 2as markdown or json

J.V.· Mar 25, 2013, 17:57 UTC · lore

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.

Phil Hord· Mar 30, 2013, 20:48 UTC · re: J.V. · lore

Re: stuck and need unstuck (git checkout)

On Mon, Mar 25, 2013 at 1:57 PM, J.V. <jvsrvcs@gmail.com> wrote:

Show 16 quoted lines

> 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