Question 136219 in Visual Studio Code Question posted in
View the official documentation.

Visual Studio Code: I lost the built-in CodeLens tools to resolve merge conflicts from Git

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?

example:

enter image description here

Tags:

2

Answers


  1. Chosen as BEST ANSWER
    0

    I upgraded to 1.71.0 and it fixed the issue. Maybe a bug with the new merge features in 1.70?


  2. 0

    Uninstall GitLens. Close and restart Visual Studio Code. Should fix it. Can re-install GitLens afterward.

    Login or Signup to reply.
Please signup or login to give your own answer.

Back To Top
Search