My workflow at the moment is VS Code for TS/JS but Sublime Merge for when I need to interact with git, ignoring the built-in VS Code stuff.