How to disable/turn off 3-way merge editor view in VSCode?

Question

Until recently, in VSCode, handling merge conflicts was simple (to me, at least):

Accept Current Change,
Accept Incoming Change,
Accept Both Changes,
Compare Changes.

It used to be something like this:

source

However, from v1.70 onwards, it's been updated. See v1.70 release notes

Now, it looks something like this:

source

At this point, I don't like this new view. So, how can I turn it off and change it back to the original one?

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) — Gino Mempin, Aug 22 '22 at 13:28

score 29 · Accepted Answer · edited Aug 29 '22 at 15:09

29

As I understand, you need to disable git.mergeEditor in your user settings:

https://dev.to/vscodetips/vs-code-tip-of-the-week-3-way-merge-editor-416h

edited Aug 29 '22 at 15:09

Adrian Mole

49,934
160
51
83

answered Aug 12 '22 at 17:04

Andrew

416
3
4

score 21 · Answer 2 · answered Aug 16 '22 at 16:15

21

Inspired from Andrew's answer and the link from my question, either put this

"git.mergeEditor": false

in your settings.json file or

Open settings, and uncheck the following checkbox:

After this, you may need to reload the window (press Ctrl + Shift + p, search for Developer: Reload Window, and press Enter) or restart the VSCode.

answered Aug 16 '22 at 16:15

Milan

1,743
2
13
36

Thanks!! Btw it froze a bit like 5seconds but I do not need to reload the window. – Thomas Chafiol Aug 31 '22 at 14:33

How to disable/turn off 3-way merge editor view in VSCode?

2 Answers2