Git merge conflicts resolve interactive feature disappeared

[normandunbar]

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.

Cheers,
Norm.