DEV Community

Discussion on: What is your favourite git merge tool/strategy?

Collapse
 
coolgoose profile image
Alexandru Bucur

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

Collapse
 
d0ruk profile image
Doruk Kutlu • Edited

+1 for gitlens

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

Collapse
 
vip3rousmango profile image
Al Romano

+1 for GitLens.

As Doruk says below it does have a bit of a learning curve but it's totally worth it.

I've uninstalled GitKraken now because of it.

Between the side-bar additions and the command palette items you should be able to git ninja your way out of most situations.

There is always Git in termial if you need to go full hacker mode. :)