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 add, then you can modify with the what you need.

enter image description here

Or you can use Visual studio instead (VS has the resolve conflicts feature similar as webstorm). In Team explorer -> Branches -> select the branch you need to rebase -> rebase -> IF there has conflicts -> click conflicts -> open a conflict file -> Merge.

enter image description here enter image description here
enter image description here

In the merge window, you can select the version you want to use -> add changes you need in result window -> Accept Merge -> view changes -> enter message -> commit.

enter image description here

Leave a Comment

Hata!: SQLSTATE[HY000] [1045] Access denied for user 'divattrend_liink'@'localhost' (using password: YES)