Git conflict markers is too dark about vscode HOT 8 CLOSED

i am interested in working on this.

i had a go at changing all four flavours as they seem to be using the same colours at the moment, so now they should be consistent with other editor colours (albeit darkened/lightened accordingly.)

latte

frappe

macchiato

mocha

please let me know what you think! if i'm going down the right track and nobody is already working on this, then i'll be happy to open a PR.

from vscode.

sounds good, i'm hoping to have some time for this tomorrow.

from vscode.

Thank you for showcasing your work!

@nekowinston and I actually started to improve the highlights in the dev branch and improved the diff highlights there. I believe we released a preview version 2.1.1 on the VSCode marketplace.

Could you please switch to the pre-release version and check if the highlights are looking better on all the flavours? @thanhbinh01234

(Apologies if this is already the pre-release version, I don't use VSCode day to day 😅)

from vscode.

Ah okay, interesting. I think the highlights we might have fixed were to do with the popup instead of the merge conflict editor.

In that case, I think it would make perfect sense to open up a PR with your current changes against the dev branch! Thanks for the work you've put into it already. @backwardspy

from vscode.

i shall do that :)

from vscode.

@backwardspy I'd appreciate if you could share the highlights you used, or even better, open a PR for it. 🙂

This repo is finally in a state where this should be less troublesome.

from vscode.

noted, thanks for reporting it

from vscode.

can confirm v2.1.1 does not resolve this particular issue

from vscode.