CODEWITHSUNDEEP
gitvisual-studio-codegit-merge-conflictcodelens
Pranav Jain
Pranav Jain

Reputation: 133

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

Upvotes: 2

Views: 794

Answers (2)

Adam
Adam

Reputation: 21

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

Upvotes: 0

VonC
VonC

Reputation: 1329562

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.

Upvotes: 3

Related Questions