From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 25 Jun 2012 19:04:47 GMT
Subject: Re: MERGE_RR droppings
Message-ID: <7vwr2vfc1c.fsf@alter.siamese.dyndns.org>
In-Reply-To: <7v8vfk2pby.fsf@alter.siamese.dyndns.org>

Junio C Hamano <gitster@pobox.com> writes:

> Phil Hord <phil.hord@gmail.com> writes:
>
>> git mergetool decides to use rerere-remaining based on the existence
>> of the .git/MERGE_RR file:
>>
>>     if test -e "$GIT_DIR/MERGE_RR"
>
> This is correct, I would probably write it with "test -f" if I were
> writing this line today, though.  After you commit to conclude the
> merge, the MERGE_RR marker should disappear.  Isn't it happening for
> you?

Oops.  It actually does not happen for _me_. An empty MERGE_RR is
left in the working tree after rerere has dealt with the conflicts.
There seems to be only three codepaths that explicitly remove
MERGE_RR that is stale:

 - (obviously) "rerere clear"
 - "git reset"
 - "git checkout otherbranch"

Perhaps mergetool should consider a missing MERGE_RR and an empty
one the same way?