Git Tricks: Avoid solving the same rebase conflict multiple times (goiabada.blog)

Seven years into git and I never knew of these rerere shenanigans