git rerere considered helpful

Today I learned that git has a feature that will replay resolutions of conflicts you've already resolved in a previous merge or rebase. When I was working on GHC and frequently rebasing on master, I would have killed for this feature. https://git-scm.com/book/en/v2/Git-Tools-Rerere Norman