Quantcast
Channel: Active questions tagged visual-studio-code - Stack Overflow
Viewing all articles
Browse latest Browse all 97371

What Visual Studio Code extension is good for 3 way merging?

$
0
0

I am currently learning Visual Studio Code. I come from a WebStorm background. Is there an option or extension to merge 3 ways?

Where in Visual Studio Code can I merge conflicts?

At the moment, I thought I had resolved all the changes but when I run git status it says there are still unmerged paths?

Where can I see these unmerged paths in VSCode or else when do I know when I merged everything?


Viewing all articles
Browse latest Browse all 97371

Trending Articles



<script src="https://jsc.adskeeper.com/r/s/rssing.com.1596347.js" async> </script>