2 ms·
If you find yourself solving the same conflicts over and over again, consider turning on rerere: https://git-scm.com/docs/git-rerere https://git-scm.com/docs/gi
by fs111 5y ago
If you find yourself solving the same conflicts over and over again, consider turning on rerere: https://git-scm.com/docs/git-rerere https://git-scm.com/docs/git-rerere