From: Junio C Hamano <junkio@cox.net>
Date: Mon, 09 Oct 2006 16:55:39 GMT
Subject: Re: "fatal: Untracked working tree file 'so-and-so' would be overwritten by merge"
Message-ID: <7vr6xhcttg.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <Pine.LNX.4.64.0610090858120.3952@g5.osdl.org>

Linus Torvalds <torvalds@osdl.org> writes:

> If the local index doesn't change, we should not print out the "Removing 
> 'so-and-so'" message, but we should also not even _touch_ that file, 
> because it was already "gone" as far as the local tree was concerned.
>
> Agreed?

Yes.