Thread (3 messages) 3 messages, 2 authors, 2016-06-15

Question about rerere

From: Tristan Roussel <hidden>
Date: 2016-06-15 23:02:51

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!
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help