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

VIEW PARENT COMMENT VIEW FULL DISCUSSION
 

+1 for gitlens

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

code of conduct - report abuse