DEV Community

Discussion on: How Do I Resolve Merge Conflicts?

Collapse
 
neatshell profile image
Claudio Stella

I think this is THE reason why I've never really switched to VSCode. And I cannot understand why is so difficult to provide a plugin that handles the conflicts like JetBrains-IDEs do.

Collapse
 
aquatofana profile image
Aqua Tofana

I mean, there's gitlens on VScode.. you can compare your code with the last commit and easily handle conflicts.