Hi,
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
<<<<<HEAD
/* current code */
======
/* incoming code */
>>>>> INCOMING
Is there anyway I could reactivate that interactive feature of clicking buttons which to choose?
Cheers