vscode: Accept Current Change or Accept Incoming Change... options do not appear in VSCode

Does this issue occur when all extensions are disabled?: Yes/No

VS Code Version: 1.64.0 Insiders
OS Version: macOS 12.0

I am not seeing the “Accept Current Change” or “Accept Incoming Change” when viewing merge conflicts

I am expecting to see this (as defined in VSCode Documentation) CleanShot 2022-01-26 at 18 53 25

But instead I just see this (notice the top bar of choices is gone)

CleanShot 2022-01-26 at 18 55 29

About this issue

Original URL
State: open
Created 2 years ago
Reactions: 3
Comments: 16 (3 by maintainers)

Most upvoted comments

Does setting git.mergeEditor to false help? Thanks!

lszomoru on Aug 25, 2022

It’s back now 👍 ( I don’t know how but it’s working ).

FYI : @lszomoru

TheScripterX on Sep 18, 2022

I have the same problem. It appeared after the update to 1.70. I have not (knowingly) changed any settings since it last worked. I have tried to add "editor.codeLens": true, to the settings.json file in the workspace but that did not help. Anything else I can try?

ingomueller-net on Aug 5, 2022

In VScode settings set:

// setting.json
"editor.codeLens": true,

zedyuan999 on Apr 26, 2022