re: What is your favourite git merge tool/strategy? VIEW POST

VIEW FULL DISCUSSION

Are you using gitlens in VSCode ? It helps a lot on the normal git flow (including merges)

+1 for gitlens

It has a learning curve, but once you invest the time, it's worth the savings.

code of conduct - report abuse