How to change VS Code's merge conflict layout?

user_19717931 0
Viewed 9916

I use VS CODE for version control (using git).

Every time I had a conflict, VS CODE showed me with a layout where I could see all the changes in one window:

with a layout where I could see all the changes in one window

However, with no advice, it change to a weird 3 windowed design where I can't understand anything.

Does someone know how can I go back to the first design?

vscode-git visual-studio-code
3 Answers
  1. Go to VS Code settings

screenshot of context menu to get to settings

  1. Untick the Git: Merge Editor setting

screenshot of setting

Now you should be able to see the previous merge layout.

user_95710380

This feature (3 way merge editor) can be enabled by setting git.mergeEditor to true and will be enabled by default in future releases.

You can set it back to false to go back to the previous design as you want.

user_141051220

This new 3-way merge editor seems to have a terrible UX issue. For me simply switching to merge editor to 'false' doesn't work as below:

git.mergeEditor = false

After this editor completely stopped showing me any merge conflict line. I have to finally do like this to revert back to original merge conflict view.

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