Re: How to selectively recreate merge state?

From: Junio C Hamano <gitster@pobox.com>
Date: Dec 11, 2009, 21:14 UTC
Message-ID: <7vtyvx1ad3.fsf@alter.siamese.dyndns.org>
In-Reply-To: <hfuakf$fnd$1@ger.gmane.org>

Paolo Bonzini <bonzini@gnu.org> writes:

Show 7 quoted lines

> On 12/11/2009 12:20 PM, Jakub Narebski wrote:
>>> >  2 and 3 are easy (cheap) to recreate from HEAD and MERGE_HEAD, 1 is not.
>>> >  I guess that's why --unresolve doesn't even attempt to do anything with 1.
>> But then "git update-index --unresolve<file>" is next to useless.
>
> Only "next to".  It can still be useful if you added a file before
> editing it, so you left in the conflict markers.

To be fair, these need to be judged within their context, and then get updated to today's reality.

"diff --cc" was merely a relatively new curiosity that allows a different view into a conflicted merge (it was still cooking in 'next'). The primary ways to inspect a conflict were "diff --theirs" and "diff --ours"; repopulating stages #2 and #3 was sufficient for them.