From: Kris Shannon <kris@shannon.id.au>
Date: Sun, 14 Mar 2010 12:24:39 GMT
Subject: Re: re-running merge on a single file
Message-ID: <e51f4f551003140524r18546bd6i202f1b886de9d7a9@mail.gmail.com>
In-Reply-To: <a038bef51003121543t52a864ddlab345dd1bcf6c906@mail.gmail.com>

On 13 March 2010 10:43, Chris Packham <judge.packham@gmail.com> wrote:
> On Fri, Mar 12, 2010 at 3:07 PM, Junio C Hamano <gitster@pobox.com> wrote:
>>  (3) If you have rerere enabled, then the conflicts would be already
>>     resolved in your working tree at this point, but not in the index, so
>>     you can reproduce the conflicted state with "checkout -m".
>
> Mental note: Need to learn more about git rerere. Sounds like what I
> need to do the job.
>

There is a script in the contrib directory written by Nanako Shiraishi called
rerere-train.sh which can be used to prime the rr-cache even if you didn't
have rerere enabled before you orginally did the merge.