← Back to context Comment by farlight 19 hours ago git rerere will resolve repeated conflicts for you automatically, you just need to enable it.https://git-scm.com/docs/git-rerere 2 comments farlight Reply WorldMaker 17 hours ago Be 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. nullsanity 19 hours ago [dead]
WorldMaker 17 hours ago Be 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.
Be 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.
[dead]