Merge conflict (via cherry-pick) does not show inline action bar for accepting changes

[MircoBabin]

Does this issue occur when all extensions are disabled?: Yes, I checked with "code --disable-extensions" and it shows the same behavior as the screenshot.

• VS Code Version: 1.65.2 (system setup)
• OS Version: Windows/10

Extension	Author (truncated)	Version
openmatchingfiles	bca	0.5.2
githistory	don	0.6.19
prettier-vscode	esb	9.5.0
remotehub	Git	0.26.0
php-cs-fixer	jun	0.2.10
php-docblocker	nei	2.7.0

Steps to Reproduce:

1. Create a merge conflict by using the commandline "git cherry-pick".
2. Open Visual Studio
3. Show merge conflict file.
4. Navigate to the line containing "<<<<<<"
5. There is no inline action bar "Accept current change | Accept incoming change ...", as described in https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts

[chrmarti]

Make sure you have code lenses for editors and merge conflicts enabled:

[MircoBabin]

1) Was enabled

2) Was disabled

---

After enabling Editor: Code Lens, the inline action bar is shown.

But I must have had a reason to disable Code Lens or to never activate it. Probably because it adds to much "noise" to my editing experience. (I also disabled mini-map.)

It feels a bit awkward that without Code Lens:

• you can have decorators.
• but you can't have the inline action bar.

I expect when decorators are enabled, the inline action bar is also automatically shown. What use do the decorators have otherwise ?

[chrmarti]

I see your point, I think the global setting for all code lenses was introduce long before we added support for merge conflicts.

Maybe check if you can turn off the code lenses that generate to much noise specifically without using the global setting for all code lenses.

[MircoBabin]

I will enable the global code lens. And see how it goes with the "noise".