Version control merge conflict highlighting is gone. about cobalt2-vscode

[epszaw]

@wesbos how about merge #88? I really miss that 😢

Hi Wes,

Submitted a PR for this issue #88

[JoaoFGuiomar]

☝️ Great theme but the missing conflict highlights is a bummer.

[rlynn523]

Agree with @JoaoFGuiomar. I noticed that it is present in the source code, but still not included in the published version in the marketplace. I ended up just editing the cobalt2.json myself, but would love to see it back in the published version. If there is something I can do to help, please let me know!

[wesbos]

thanks! will fix this

[wesbos]

If anyone wants to submit a PR to this I'd love it :)

[epszaw]

@wesbos hm, the problem appeared again. Using v2.1.6 🤔

[tomevans18]

+1 issue is back.

[danielnieto]

guess who's back? back again, issue is back, tell a friend

[react-native-guy]

Hi @wesbos , I can confirm that the latest version has this bug. Can you verify and reopen this issue ?

[ItamarShDev]

@rlynn523 the same code is in the package , but not working for some reason