Git merge conflicts resolve interactive feature disappeared

I use GitHub Desktop and VS code for platformio.

I noticed that when I resolve the git merge conflicts, I no longer see the clickable UI buttons for choosing which code to choose (i.e the “current” or “incoming”). Instead, I just see these ugly

/* current code */
/* incoming code */

Is there anyway I could reactivate that interactive feature of clicking buttons which to choose?

That, unfortunately, is a VSCode problem and not a PlatformIO problem. There have been a few updates to VSCode just recently. I’ve not had a chance to check out any Git changes yet.


1 Like