4 ms·
git rerere will resolve repeated conflicts for you automatically, you just need to enable it. https://git-scm.com/docs/git-rerere https://git-scm.com/docs/git-
by farlight 2mo ago
git rerere will resolve repeated conflicts for you automatically, you just need to enable it.
https://git-scm.com/docs/git-rerere https://git-scm.com/docs/git-rerere
- nullsanity 2mo ago[dead]
- WorldMaker 2mo agoBe careful, it will also cache any mistakes in merging including things like bug regressions. Especially if you also have a git history full of cherry-picking and reverts.