There has been a lot of comments regarding Microsofts decision to change the default Merge Editor in VS Code. See this Github Issue that blew up: https://github.com/microsoft/vscode/issues/157361 🔥
TL;DR
To switch back to the regular Merge Editor make this change in your settings.json
"git.mergeEditor": false
Also make sure that merge-conflict.decorators.enabled is true (which is the default). In my feverish attempt to disable the new 3-way Merge Editor I flipped a couple of switches I shouldn't have... :)
Btw, there is a PR to change the default back to false: https://github.com/microsoft/vscode/pull/158544
Update: The PR has been closed. It seems the VSCode maintainers are determined to use the new merge editor, but make it easier to switch back.
Top comments (1)
Perfect! Thank you!