2025/10/12

That git ships a feature that remembers how you resolve conflicts, git-rerere: https://git-scm.com/book/en/v2/Git-Tools-Rerere.