On 2021-06-06 at 12:30:25, Junio C Hamano wrote: > By default, the rerere machinery has been disabled since a bug in > the machinery could screw up the end user's data at the most > stressful time during the end user's workday (i.e. during conflict > resolution). > > It however has been in wide use without causing much trouble (other > than, obviously, replaying a broken conflict resolution that was > recorded earlier when the user made a mismerge), and it is about > time to enable it by default. Yes, I think this makes sense. I've been using it for quite a while without problems and I'm usually quite good at breaking things, and if we can make the user experience better, which I think rerere does, that's definitely a good thing. -- brian m. carlson (he/him or they/them) Houston, Texas, US
Attachment:
signature.asc
Description: PGP signature
