2

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

Pranav Jain
  • 133
  • 3
  • 1
    Does this answer your question? [Not getting GitHub merge conflicts Top-bar in VSCode](https://stackoverflow.com/questions/73368728/not-getting-github-merge-conflicts-top-bar-in-vscode) – Abbas Hosseini Aug 26 '22 at 12:24

2 Answers2

3

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.

VonC
  • 1,262,500
  • 529
  • 4,410
  • 5,250
  • Thank you so much. Yes, setting the git.mergeEditor reverts to the old behavior. That is great to know about the new merge view! – Pranav Jain Aug 17 '22 at 05:45
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

Adam
  • 21
  • 1
  • 3