# Question about rerere 4 messages from 2014-11-06 to 2014-11-06. Participants: Tristan Roussel, Thomas Adam, Christian Neukirchen. Thread: https://gitlist.dev/t/37890 ## Tristan Roussel, 2014-11-06 11:30 Subject: Question about rerere Message-ID: URL: https://gitlist.dev/e/F9D7CE90-BED2-4694-B5DB-AE848C9F3F34%40phare.normalesup.org ``` 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. Thanks for your help! ``` ## Christian Neukirchen, 2014-11-06 16:41 Subject: Re: Question about rerere Message-ID: <87oaske0y1.fsf@gmail.com> URL: https://gitlist.dev/e/87oaske0y1.fsf%40gmail.com In-Reply-To: ``` Tristan Roussel writes: > 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. (Which I learned from http://git-blame.blogspot.de/2012/04/rebuilding-git-integration-environment.html) Ciao, -- Christian Neukirchen http://chneukirchen.org ``` ## Thomas Adam, 2014-11-06 17:03 Subject: Re: Question about rerere Message-ID: URL: https://gitlist.dev/e/CA%2B39Oz4k97uKceBmaiz3z5m2sVZ6jtQS9s%2BUVCwixkF_Rn%2BU%2BA%40mail.gmail.com In-Reply-To: ``` On 6 November 2014 11:30, Tristan Roussel 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 ``` ## Tristan Roussel, 2014-11-06 22:29 Subject: Re: Question about rerere Message-ID: URL: https://gitlist.dev/e/AC58C459-3E1D-4C6A-B717-9609F29F78A6%40phare.normalesup.org In-Reply-To: ``` > Le 6 nov. 2014 à 18:03, Thomas Adam a écrit : > > On 6 November 2014 11:30, Tristan Roussel 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 Thank you very much for the advice (and sorry for not searching enough). ```