search

wesbos / cobalt2

Tweaked and refined Sublime Text theme based on the original cobalt.
1.56k stars 154 forks source link

Implement better highlighting for merge conflicts #166

Open dzsi1994 opened 5 years ago

dzsi1994 commented 5 years ago

Merge conflict is something that unfortunately we (developers) have to face quite often. A merge conflict can be really challenging to solve. In order to that, in my opinion the cobalt2 theme could improve to help developers fix conflicts more easily. For instance add diff background colors to highlight the currect and incoming change.

wesbos commented 5 years ago

Are you referring to VS code or sublime?

dzsi1994 commented 5 years ago

I am referring to VS code! I need to change from cobalt2 theme to another theme every time I have conflicts because other themes have much better UI/UX in regards to highlight the merge conflicts.

ItamarShDev commented 4 years ago

Same here it is the only think keeping me away from the theme.

wesbos commented 4 years ago

Anyone want to submit a PR? Maybe justnpull the styles from another theme?