How to change the conflict resolution interface in vscode?

Question

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.

in the settings have you found anything with the term `merge`, also search SO before asking a question, this is about the tenth identical question in last few days — rioV8, Aug 11 '22 at 20:26

score 20 · Answer 1 · answered Aug 12 '22 at 16:17

20

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

answered Aug 12 '22 at 16:17

Chris

476
4
10

13

Thanks for the info. New `mergeEditor` is unusable IMO. – RealGecko Aug 18 '22 at 06:39
I think i will check out some tutorials, 3 way merge seems to be pretty cool if you understand it. – Chris Aug 18 '22 at 08:07
8

Maybe, but IMO if you need tutorial on something "visual" then it's badly designed. – RealGecko Aug 19 '22 at 12:07

score 3 · Answer 2 · answered Sep 05 '22 at 04:47

3

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

answered Sep 05 '22 at 04:47

Roshan Maddumage

130
3
12

This doesn't seem to work anymore (Version 1.73.1). It just opens the "Incoming" file. – Javad Nov 28 '22 at 10:57

How to change the conflict resolution interface in vscode?

2 Answers2