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 this interface, I’ve explored hundreds of settings in vscode but haven’t found the right one.
Thanks a lot in advance.
2
Answers
There is a setting called "git.mergeEditor" disable it then you have the old view back !
@Cristian Diaz Please refer to the latest version (1.71.0) Release note. They didn’t remove the old merge conflicts resolution. We can enable it by clicking on the file icon.