From: Nicolas Pitre <nico@cam.org>
Date: Wed, 15 Oct 2008 19:32:21 GMT
Subject: Re: Untracked working tree files
Message-ID: <alpine.LFD.2.00.0810151531140.26244@xanadu.home>
In-Reply-To: <20081015122621.a9674d75.akpm@linux-foundation.org>

On Wed, 15 Oct 2008, Andrew Morton wrote:

> I do
> 
> 	git-reset --hard HEAD
> 	git-reset --hard linux-next
> 	git-checkout linux-next
> 
> and get
> 
> error: Untracked working tree file 'Next/SHA1s' would be overwritten by merge.
> y
> 
> grr.

What about simply:

	git-checkout -f linux-next


Nicolas