DEV Community


Discussion on: 10 Common Git Problems and How to Fix Them

tmr232 profile image
Tamir Bahar

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.