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.
+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. :)
We're a place where coders share, stay up-to-date and grow their careers.
We strive for transparency and don't collect excess data.