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

Visual Studio Code – Vscode merge conflict with yellow square

somehow my vscode changed, when i want to resolve merge conflict,there is something like <<<<HEAD , but now it’s like a yellow square on picture, why is that? can anyone tell me why?

enter image description here

Tags:

4

Answers


  1. Chosen as BEST ANSWER
    0

    I finally fix this by these configs

    "diffEditor.codeLens": true,
"git.mergeEditor": false

  2. 0

    In the user settings, you can disable Git Merge Editor:

    VS Code Settings Screenshot

    img

    Login or Signup to reply.
  3. 0

    Go to settings -> find "Git Merge Editor" -> disable "Git: Merge Editor"

    Turn off Visual Studio Code merge editor

    Login or Signup to reply.
  4. 0

    If you don’t want to remove this feature, there should be a checkbox to the left of each yellow box which you can use to select the conflict(s) that you would like to persist (similar to how the old merge conflict control worked)

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

Back To Top
Search