WebStorm-like version control in Visual Studio Code
There is no such feature for VS code. But you can install some git extensions to view and resolve conflict files easily. Such as you can install the extension Git Lens, and when you open conflict files -> click Toggle File Blame, there will shows which lines were you committed and which lines are new … Read more