re: 10 Common Git Problems and How to Fix Them VIEW POST

TOP OF THREAD FULL DISCUSSION
re: I strongly recommend to all careful developers to never use rerere. Resolving a conflict does not sure that you resolved it correctly, as some bug...
 

I have to agree on this one. I've been burned by rerere on multiple occasions. You merge, there are seemingly no conflicts, and then everything breaks.
I'd much rather repeat the same resolution over and over again and not get a bad automated resolution.

code of conduct - report abuse