Thread (18 messages) flat view 18 messages, 5 authors, 2016-06-15

Re: Untracked working tree files

From: Nicolas Pitre <hidden>
Date: 2016-06-15 22:45:29

On Wed, 15 Oct 2008, Nicolas Pitre wrote:
On Wed, 15 Oct 2008, Andrew Morton wrote:
quoted
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
Never mind -- you apparently did that already with success.


Nicolas
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help