3 ms·
> if I don't do that, I end up resolving the same conflict over and over You should check out git rerere. https://www.git-scm.com/book/en/v2/Git-Tools-Rerere
by quesera 6y ago
> if I don't do that, I end up resolving the same conflict over and over
You should check out git rerere.
https://www.git-scm.com/book/en/v2/Git-Tools-Rerere https://www.git-scm.com/book/en/v2/Git-Tools-Rerere
- mikepurvis 6y agoInteresting, thanks for that! Will try in the future.