CODEWITHSUNDEEP
visual-studio-codemerge-conflict-resolution
Cristian Diaz
Cristian Diaz

Reputation: 395

How to change the conflict resolution interface in vscode?

Some days ago vscode started showing the following interface any time I had a git conflict:

Visual Studio Code interface for git conflict solving

But I don't like it and want the regular one, the one that looks like this:

Regular interface for conflict solving in vscode

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.

Upvotes: 16

Views: 3621

Answers (2)

Roshan Maddumage
Roshan Maddumage

Reputation: 150

@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.

enter image description here

Upvotes: 3

Chris
Chris

Reputation: 575

There is a setting called "git.mergeEditor" disable it then you have the old view back !

Upvotes: 20

Related Questions