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)

code of conduct - report abuse