Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Git merge/rebase conflict resolution does not highlight #180

Open
tylerbecks opened this issue Nov 10, 2020 · 2 comments
Open

Git merge/rebase conflict resolution does not highlight #180

tylerbecks opened this issue Nov 10, 2020 · 2 comments

Comments

@tylerbecks
Copy link

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

I have actually run into issues because I've missed git conflicts during a rebase.
@wesbos
Copy link
Owner

wesbos commented Nov 10, 2020

Sorry, this is the repo for Sublime Text, Could you open in https://github.com/wesbos/cobalt2-vscode/

@tylerbecks
Copy link
Author

Sorry, this is the repo for Sublime Text, Could you open in https://github.com/wesbos/cobalt2-vscode/

Done! wesbos/cobalt2-vscode#168

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
2 participants
@wesbos @tylerbecks