My current Git workflow is:
VSCode's built in git isn't that great if you ask me. I like selective staging where I can stage/unstage particular line(s), which isn't supported by VSCode. Also, you cannot use keyboard in their staging area, which is very much bad experience for me.
Maybe we all should pool in and port the Atom's git integration to VSCode so we'll have the perfect editor of all time.
You can stage/unstage particular lines with VSCode. I do it all the time. Only rule is that the lines must be consecutive.
Vs codes conflict resolver is also good, no need for another tool. Source tree to Vs code.
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.