{"thread":{"id":"37890","subject":"Question about rerere","startedAt":"2014-11-06T11:30:31Z","lastAt":"2014-11-06T22:29:51Z","messageCount":4,"participants":["Tristan Roussel","Thomas Adam","Christian Neukirchen"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"251435","messageId":"F9D7CE90-BED2-4694-B5DB-AE848C9F3F34@phare.normalesup.org","threadId":"37890","inReplyTo":null,"subject":"Question about rerere","fromName":"Tristan Roussel","fromEmail":"troussel@phare.normalesup.org","sentAt":"2014-11-06T11:30:31Z","receivedAt":"2014-11-06T11:30:31Z","isPatch":false,"sender":{"key":"troussel@phare.normalesup.org","avatar":null},"body":"Hello,\n\nI’ve just learnt about rerere and it’s going to make my life so much easier, I have a question though.\n\nI 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.\n\nThanks for your help!"},{"id":"251437","messageId":"87oaske0y1.fsf@gmail.com","threadId":"37890","inReplyTo":"F9D7CE90-BED2-4694-B5DB-AE848C9F3F34@phare.normalesup.org","subject":"Re: Question about rerere","fromName":"Christian Neukirchen","fromEmail":"chneukirchen@gmail.com","sentAt":"2014-11-06T16:41:26Z","receivedAt":"2014-11-06T16:41:26Z","isPatch":false,"sender":{"key":"chneukirchen@gmail.com","avatar":"https://avatars.githubusercontent.com/u/139?v=4"},"body":"Tristan Roussel writes:\n\n> Hello,\n>\n> I’ve just learnt about rerere and it’s going to make my life so much\n> easier, I have a question though.\n>\n> I enabled rerere very lately and I wanted to know if there was a way\n> to feed rerere with old merge conflict resolutions (and if not, would\n> it be considered a good feature request)? I’d like to do a rebase of\n> my work because I unintentionally merged a branch I didn’t want and\n> the merge is a bit far in the git history and I don’t want to\n> re-resolve merge conflicts I had after that.\n\nHave a look at contrib/rerere-train.sh.\n\n(Which I learned from\nhttp://git-blame.blogspot.de/2012/04/rebuilding-git-integration-environment.html)\n\nCiao,\n-- \nChristian Neukirchen http://chneukirchen.org\n"},{"id":"251436","messageId":"CA+39Oz4k97uKceBmaiz3z5m2sVZ6jtQS9s+UVCwixkF_Rn+U+A@mail.gmail.com","threadId":"37890","inReplyTo":"F9D7CE90-BED2-4694-B5DB-AE848C9F3F34@phare.normalesup.org","subject":"Re: Question about rerere","fromName":"Thomas Adam","fromEmail":"thomas@xteddy.org","sentAt":"2014-11-06T17:03:10Z","receivedAt":"2014-11-06T17:03:10Z","isPatch":false,"sender":{"key":"thomas@xteddy.org","avatar":"https://gravatar.com/avatar/e7256db4738e501e5d2e84f00bb0bd99503165729573848a03330301fc2adc4a?d=mp&s=160"},"body":"On 6 November 2014 11:30, Tristan Roussel wrote:\n> Hello,\n>\n> I’ve just learnt about rerere and it’s going to make my life so much easier, I have a question though.\n>\n> 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.\n\nHave a look at contrib/rerere-train.sh\n\n-- Thomas Adam\n"},{"id":"251440","messageId":"AC58C459-3E1D-4C6A-B717-9609F29F78A6@phare.normalesup.org","threadId":"37890","inReplyTo":"CA+39Oz4k97uKceBmaiz3z5m2sVZ6jtQS9s+UVCwixkF_Rn+U+A@mail.gmail.com","subject":"Re: Question about rerere","fromName":"Tristan Roussel","fromEmail":"troussel@phare.normalesup.org","sentAt":"2014-11-06T22:29:51Z","receivedAt":"2014-11-06T22:29:51Z","isPatch":false,"sender":{"key":"troussel@phare.normalesup.org","avatar":null},"body":"\n> Le 6 nov. 2014 à 18:03, Thomas Adam a écrit :\n> \n> On 6 November 2014 11:30, Tristan Roussel wrote:\n>> Hello,\n>> \n>> I’ve just learnt about rerere and it’s going to make my life so much easier, I have a question though.\n>> \n>> 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.\n> \n> Have a look at contrib/rerere-train.sh\n> \n> -- Thomas Adam\n\nThank you very much for the advice (and sorry for not searching enough)."}]}