Git conflict resolution déjà vu?

from blog lmno.lol @alvaro, | ↗ original
use git rerere. here's a post.