From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 16 Dec 2008 00:16:01 GMT
Subject: Re: [PATCH] modify/delete conflict resolution overwrites untracked file
Message-ID: <7vprjtug8u.fsf@gitster.siamese.dyndns.org>
In-Reply-To: <20081215230205.GA19538@localhost>

Clemens Buchacher <drizzd@aon.at> writes:

> I strongly disagree. With the suggested behavior I would have to
> double-check every single untracked file in my tree for conflicts before
> trying a throw-away merge followed by git reset --hard, for example.

AFAICS, that's not "suggested behaviour" for merge, but it is the
behaviour that has been true for eternity.

You can suggest to fix "reset --hard", though.