From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 30 Apr 2012 00:16:18 GMT
Subject: Re: git bug: moved file with local unstaged changes are lost during merge
Message-ID: <7vr4v6hy5p.fsf@alter.siamese.dyndns.org>
In-Reply-To: <20120429141758.GA6500@ecki.lan>

Clemens Buchacher <drizzd@aon.at> writes:

> 2. merge_trees -> process_entry
>
> Find possible rename pairs and try to merge renames. Due to the renames,
> entries that were classified as b) above can now become of type a).

Yes, unfortunately the rename-processing part of merge-recursive is known
to be broken wrt things like this.  If you want to punt,

> Maybe we should disable merging with a dirty work tree altogether, until
> we have a solution that is safe to use?

this is not the way to go, as "resolve" is perfectly safe.  It would make
more sense to disable the rename-processing part of recursive by default,
until it gets cleaned up further.