git-rerere – Reuse recorded resolution of conflicted merges | Hacker News Reader