Implement better highlighting for merge conflicts

Open dzsi1994 opened this issue 7 years ago • 4 comments

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.

Aug 08 '18 11:08 dzsi1994

Are you referring to VS code or sublime?

Oct 04 '18 13:10 wesbos

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.

Oct 04 '18 16:10 dzsi1994

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

Aug 20 '19 06:08 ItamarShDev

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

Aug 21 '19 15:08 wesbos