title: WebStorm-like version control in Visual Studio Code
body: <p>I've mostly switched to Visual Studio Code from WebStorm for my Node.js development.</p>
  
  <p>For the most part, I'm able to do everything in VSCode, however I find that the VCS implemented in VSCode is lacking compared to WebStorm's.</p>
  
  <p>In particular, I find WebStorm's conflict resolution when rebasing feature branches much more user friendly.</p>
  
  <p>And so I was wondering if there is anything equivalent to WebStorm's 'VCS -> Git -> Resolve Conflicts...' feature in VSCode.</p>