wesbos/cobalt2-vscode

Git merge/rebase conflict resolution does not highlight #180

Open

#168 opened on Nov 10, 2020

View on GitHub
 (3 comments) (0 reactions) (0 assignees) (248 forks)github user discovery
good first issuehelp wanted

Repository metrics

Stars
 (804 stars)
PR merge metrics
 (PR metrics pending)

Description

In Cobalt 2, git conflicts are not highlighted. See the screenshot below: Screen Shot 2020-11-10 at 10 03 15 AM

In other themes, conflicts are highlighted and easily recognizable. See the screenshot below, this was taken with the theme Monakai. Screen Shot 2020-11-10 at 10 03 52 AM

Contributor guide