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. :)
Are you sure you want to hide this comment? It will become hidden in your post, but will still be visible via the comment's permalink.
Hide child comments as well
Confirm
For further actions, you may consider blocking this person and/or reporting abuse
We're a place where coders share, stay up-to-date and grow their careers.
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. :)