+ Start a Discussion
Parteek Goyal 3Parteek Goyal 3 

How to solve conflicts in SVN using Visual Studio Code

Hi All,

I am trying to resolve merge conflicts in visual studio code using SVN repository. I can see below two options as well related to this. But I am not sure how to use these. 
  • SVN: Resolved conflicts for selected
  • SVN: Resole All conflicts
Could you please help me to fix this issue.User-added image
Thanks,
Parteek