Toggles for individual CodeLens features

[fenhl]

Resolving merge conflicts in one command requires turning on Code Lens. However, this also turns on unrelated annotations, such as number of references for PowerShell functions. These are distracting so I had to disable Code Lens again and resort to editing merge conflicts manually. It would be nice if the merge conflict commands could be enabled individually.

[jrieken]

Extensions are in charge of this. VS Code itself comes with one big setting to enable/disable the whole feature but extensions contributing lenses should also have settings, like gitlens.codeLens.enabled. So, please reach out to the PowerShell extension for this specific request.

Wrt to merge conflicts: please be aware that we are adding better merge experience with a fullblown merge editor. Use insiders and this setting: git.mergeEditor

[vscodenpa]

This issue is caused by an extension, please file it with the repository (or contact) the extension has linked in its overview in VS Code or the marketplace for VS Code. See also our issue reporting guidelines.

Happy Coding!

[fenhl]

I see. The relevant issue for this specific annotation is PowerShell/vscode-powershell#3902.