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

Visual Studio Code – Why don't merge conflict decorators appear in vscode?

Strangely, the merge conflict decorators are not appearing in vscode. My "merge conflict > decorators" setting is "enabled", so I am really confused why it is not working. This happened when I installed vscode on my windows computer from scratch. Please let me know what yoy think?

enter image description here

Tags:

2

Answers


  1. 0

    If you are using VSCode 1.69 (June 2020) or more, there is a new merge view, which allows a side-by-side resolution.

    But as a result, the old merge conflict decorators are no longer there.

    Setting git.mergeEditor to false might help you to revert to the old behavior.

    Login or Signup to reply.
  2. 0

    Setting git.mergeEditor to false didn’t work to me. I had to navigate to extensions and disable Merge Conflict extension enter image description here

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

Back To Top
Search