I turned this feature on for a few of my git repos but I had completely forgotten about it. As far as I recall the feature has been around for a few years now. It can be turned on globally by doing
git config --global rerere.enabled 1
It pretty much automates the resolution of conflicts in long lived branches. I’ve been lazy recently and I have just doing merges instead rebasing, which lead me to re-discover git rerere.