3 ms·If you use git-rerere you don't have to fix the same conflicts over and over againby altonen 5y agoIf you use git-rerere you don't have to fix the same conflicts over and over again