Versioning WebStorm in Visual Studio Code
Basically I switched to Visual Studio Code from WebStorm for my Node.js development.
For the most part, I can do everything in VSCode, however I found that VCS implemented in VSCode is missing compared to WebStorm.
Specifically, I find a solution to resolve WebStorm where the functionality of the redistribution of functions is more user friendly.
And so I was wondering if there is something that is equivalent to the WebStorm VCS -> Git -> Resolve Conflicts ... 'function in VSCode.
source to share
There is no such feature for VS Code. But you can install multiple git extensions to view and resolve conflict files easily.
For example, you can install the Git Lens extension , and when you open the conflict files -> click Toggle File Blame, it will show there which lines were made by you and which new lines were added, then you can change with what you need.
Or you can use Visual studio instead (VS has a conflict conflicts feature like webstorm). In Team explorer -> Branches -> select the branch you need to reinstall -> rebase -> If there are conflicts -> click conflicts -> open the conflict file -> Merge.
In the merge window, you can select the version you want to use → add the required changes in the results window → Accept the merge → view changes → enter message → commit.
source to share