[argulane]

It's bit hidden but once you enable `git rerere`, it will remember your fixed up rebase conflicts.

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

[xrisk]

Wow this is super neat. I wonder why it isn’t enabled by default.