From: Alexander Gavrilov <angavrilov@gmail.com>
Date: Wed, 17 Sep 2008 22:24:03 GMT
Subject: Re: [PATCH/RFC 0/2] git-gui: issues with merge tool series
Message-ID: <200809180224.03833.angavrilov@gmail.com>
In-Reply-To: <200809172340.16367.johannes.sixt@telecom.at>

On Thursday 18 September 2008 01:40:16 Johannes Sixt wrote:
> On Mittwoch, 17. September 2008, Alexander Gavrilov wrote:
> >    By the way, is there a simple way to re-create a conflict file from
> > the saved multistage index entries?
> 
> There's 0cf8581e (checkout -m: recreate merge when checking out of unmerged 
> index) in 'next'. But that does not address how the unmerged entries get into 
> the index.

If everything else fails, the entries can be fetched from the index and
cached in RAM by git-gui itself. Then it will be able to put them back
via update-index --index-info.

Alexander