How to change VS Code’s merge conflict layout?

by

In General, VS Code shows all the changes in single pane of window for confliction.

Sometime VS Code doesn’t work as expected in merge conflict and shows different windows for all the changes.

This issue happens because of feature (3 way merge editor) into VS Code settings. if enabled, it shows all the changes to different windows into editor and becomes hard to predict and understand the changes.

So you need to revert the ‘3 way merge editor’ configuration in VS Code back to merge conflict view to its original view.

Steps to Change VS Code’s Merge Conflict Layout:

To Change VS Code’s Merge Conflict Layout, Go to VS Code settings ->> Search ‘Git: Merge Editor’ and Untick it and merge conflict layout will start behaving as expected.

VS Code’s merge conflict layout

Alternatively use the command “diffEditor.codeLens”: true, “git.mergeEditor”: false to set the VS Code merge conflict view to its original view.

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

Related Posts:

  1. Fix: Emmet abbreviations in VSC 1.69.0 not working, like ! or *
  2. [Fix] Git Bad Status Code 500 Visual Studio Code
  3. [Fix] VS Code ‘!’ or exclamation mark HTML autocomplete not working
  4. [Fix] Commit operation was cancelled due to empty commit message Error
  5. [Fix] “Error while fetching extensions XHR failed”
  6. [Fix] env python No such file or directory when building app with Xcode
  7. [Fix] Error: “Cannot read properties of null”
  8. [Fix] Error: “Cannot read properties of null (reading ‘command’)”
  9. Solved: VSCode merge conflict with yellow square
  10. [Fix] MacOs sed: illegal option — r Visual Studio Code Error