@b0rk I just turned on rerere in my fork of gcc, and it... kinda helps? It doesn't catch all of the merge conflict resolutions that I might hope it would catch, but it at least catches some of them...