[ricksharp]

vscode with ‘git graph’ extension is the best git toolset ever.

My favorite feature is ctrl+click 2 nodes in the git tree and immediately see file level diff which I can explore in vscode’s diff viewer.

For work, we use git flow with github PR (which I do on github website) and always work in feature branches. I am able to navigate git like a pro, cherry picking etc as needed without a problem. It even works well with git submodules.

If something goes unexpected, git graph is the best tool to figure out what happened and to be able to repair it.

Also, vscode handles merge conflicts in a way I can actually understand and correct without it slowing me down.