Conversation
Edited 10 days ago

Wait, git rerere is _off_ by default??!

https://git-scm.com/book/en/v2/Git-Tools-Rerere

Add that to the list of user hostile defaults.

2
2
0

@llvm try recording the wrong merge resolution once and then wondering why the following ones are always bad, automatically. Oh, that's because you enabled rerere and then forgot about it.

0
0
1
@llvm of course it's off, because it requires careful management how you actually resolve conflict, so only good resolutions are recorded. It's additional, complicating step, thus must be conscious opt in...
0
0
0