On 6 November 2014 11:30, Tristan Roussel <troussel@xxxxxxxxxxxxxxxxxxxx> 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 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html