How to disable/turn off 3-way merge editor view in VSCode? [duplicate]
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
vscode-git
Visual Studio Code: Review Merge Changes Side by Side, rather than top down
2022: update for VSCode 1.69 (June 2022), as noted in Audwin Oyong’s answer, there is now a 3-way merge view, which allows a side-by-side resolution. In this release, we continued working on the 3-way merge editor. This feature can be enabled by setting git.mergeEditor to true and will be enabled by default in future releases. … Read more
How to change VS Code’s merge conflict layout?
Go to VS Code settings Untick the Git: Merge Editor setting Now you should be able to see the previous merge layout.