merge-conflict-resolution Questions

Visual Studio Code – Cant get merge conflict to appear locally but Azure devops says I have a conflict?

February 27, 2024
getCritical
2 Answers

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…

VIEW QUESTION

Visual Studio Code – How to change the conflict resolution interface in vscode?

August 11, 2022
Cristian Diaz
2 Answers

Some days ago vscode started showing the following interface any time I had a git conflict: But I don't like it and want the regular one, the one that looks like this: How can I modify the configurations to change…

VIEW QUESTION