From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 16 Mar 2012 16:42:47 GMT
Subject: Re: Edit a rerere conflict resolution
Message-ID: <7vobrwh4zc.fsf@alter.siamese.dyndns.org>
In-Reply-To: <7vvcm4h61a.fsf@alter.siamese.dyndns.org>

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

> Vincent van Ravesteijn <vfr@lyx.org> writes:
>
>> No, I turned rerere.autoupdate off. Proven in the above by the line
>> "Resolved... " instead of "Staged...".
>
> Yeah, actually I just tried and the procedure works with or without
> autoupdate for me.
>
> So there is something different between our setup (or the nature of the
> conflict), but I do not know what it is offhand.

The last message from me on this topic for now as I'll be a bit too busy,
but a wild guess/hunch: grep NEEDSWORK near rerere.c::handle_cache()?

I suspect that we might need to also update this function to handle "both
sides added, but differently" case, as we do so in check_one_conflict()
these days, but for Vincent's particular case that shouldn't be the cause.