In Visual Studio Code 1.70 when viewing a file with Git merge conflict markers, I no longer get the blue/green highlighting nor the "Accept Current Changes…" CodeLens choices, even though setting "Merge-conflict › Code Lens" is enabled. Any idea how to fix?
2
Answers
I upgraded to 1.71.0 and it fixed the issue. Maybe a bug with the new merge features in 1.70?
Uninstall GitLens. Close and restart Visual Studio Code. Should fix it. Can re-install GitLens afterward.