From: Clemens Buchacher <drizzd@aon.at>
Date: Mon, 15 Dec 2008 09:59:49 GMT
Subject: Re: [PATCH] modify/delete conflict resolution overwrites untracked file
Message-ID: <20081215095949.GA7403@localhost>
In-Reply-To: <7vmyeyyuuh.fsf@gitster.siamese.dyndns.org>

On Sun, Dec 14, 2008 at 07:34:46PM -0800, Junio C Hamano wrote:
> merge-recursive: do not clobber untracked working tree garbage
> 
> When merge-recursive wanted to create a new file in the work tree (either
> as the final result, or a hint for reference purposes while delete/modify
> conflicts), it unconditionally overwrote an untracked file in the working
> tree.  Be careful not to lose whatever the user has that is not tracked.

This leaves the index in an unmerged state, however, so that a subsequent
git reset --hard still kills the file. And I just realized that the same
goes for merge-resolve. So I'd prefer to abort the merge, leave everything
unchanged and tell the user to clean up first.