Visual Studio Code – Cant get merge conflict to appear locally but Azure devops says I have a conflict?
Normally when I have a merge conflict my visual studio code editor will let me know of the incoming changes, but in this case when I pushed up some code Azure devops said I had a conflict but I cant…