Gregory's Server
a bunch of folks have mentioned that they use rerere to avoid solving the same merge conflict a million times during a rebase. If you use it, do you find it works well? are there any downsides to using it?
|
6 comments
@b0rk I used it once and it was so magical and quiet that I thought something went wrong. So…it worked, but maybe should've been a bit more vocal about what it did? @b0rk A coworker told me about it last year? I think. I tried it but it didn't work. We couldn't figure out why. @b0rk I’ve only used it once, but it worked well. I had to fix a big merge conflict with lots of files, and it gave me comfort to know, “I’ll only have to fix this once.” @b0rk Sometimes I have trouble getting it to forget a resolution, which is annoying when it occurs. But I tend to get the resolution right more than wrong, so rerere is a net positive for me |
@b0rk I just turned on rerere in my fork of gcc, and it... kinda helps? It doesn't catch all of the merge conflict resolutions that I might hope it would catch, but it at least catches some of them...