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?

CodePudding user response：

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.