3 ms·Git Tricks: Avoid solving the same rebase conflict multiple times6 points by danzanzini 5y agofcfl 5y agoSeven years into git and I never knew of these rerere shenanigans