Resolve merge conflicts toolbar not showing in VS Code

user_6030343 0
Viewed 322

I'm using the latest version of VS Code, and did a git stash, git pull, git stash apply. Normally when there are merge conflicts I can see this toolbar to solve them (Accept incoming, etc.) but this time the toolbar was not there. Is this a bug, or just a feature that now needs to be enabled manually?

Screenshot enter image description here

Version: 1.42.1
Commit: c47d83b293181d9be64f27ff093689e8e7aed054
Date: 2020-02-11T14:44:27.652Z
Electron: 6.1.6
Chrome: 76.0.3809.146
Node.js: 12.4.0
V8: 7.6.303.31-electron.0
OS: Darwin x64 19.3.0
visual-studio-code git
2 Answers

Enable the code Lens parameter in the vs code settings Under section editor différence

user_27177000

This also happened to my vscode; the solution for me was to open settings (command+comma), search for merge, and disable Git: Merge Editor.

Reload vscode (ctr + R)

Thanks to Abe Dolinger

user_31841950
Related