From: Thomas Adam <thomas@xteddy.org>
Date: Thu, 06 Nov 2014 17:03:10 GMT
Subject: Re: Question about rerere
Message-ID: <CA+39Oz4k97uKceBmaiz3z5m2sVZ6jtQS9s+UVCwixkF_Rn+U+A@mail.gmail.com>
In-Reply-To: <F9D7CE90-BED2-4694-B5DB-AE848C9F3F34@phare.normalesup.org>

On 6 November 2014 11:30, Tristan Roussel <troussel@phare.normalesup.org> wrote:
> Hello,
>
> I’ve just learnt about rerere and it’s going to make my life so much easier, I have a question though.
>
> I enabled rerere very lately and I wanted to know if there was a way to feed rerere with old merge conflict resolutions (and if not, would it be considered a good feature request)? I’d like to do a rebase of my work because I unintentionally merged a branch I didn’t want and the merge is a bit far in the git history and I don’t want to re-resolve merge conflicts I had after that.

Have a look at contrib/rerere-train.sh

-- Thomas Adam