Use legacy conflict resolution view in VS Code

Asked Aug 09 '22 at 18:10

Active Sep 12 '22 at 18:40

Viewed 527 times

After the June (or July) 2022 update, the merge conflict view no longer looks like the one in the documentation: https://code.visualstudio.com/Docs/editor/versioncontrol#_merge-conflicts

I do not like the new 3-way view at all. Is there any way to go back to the previous merge conflict view (as it appears in the above documentation link)?

I tried adding the following to settings.json, but the result was no diff decoration at all:

"git.mergeEditor": false,

UPDATE:

For anyone who comes across this, the following combination has resolved this issue for me and others who have commented below.

"diffEditor.codeLens": true,
"git.mergeEditor": false,

edited Sep 12 '22 at 18:40

asked Aug 09 '22 at 18:10

Kevin Boucher

16,426
3
48
55

2

thank you for posting this, that new view is nightmarishly complicated compared to this – skyleguy Aug 19 '22 at 17:39
yes, completely nightmare such a change. – Kinka Aug 26 '22 at 08:36
The last combination works for me, thanks a lot!! – Bruno Martins Sep 07 '22 at 13:11
Does this answer your question? [How to change VS Code's merge conflict layout?](https://stackoverflow.com/questions/73277690/how-to-change-vs-codes-merge-conflict-layout) – starball Feb 13 '23 at 00:30

Use legacy conflict resolution view in VS Code

0 Answers0