Doesn't work with the 'Seti' theme

smashwilson / merge-conflicts

Resolve git merge conflicts in Atom

https://atom.io/packages/merge-conflicts

MIT License

432 stars 42 forks source link

Doesn't work with the 'Seti' theme #240

Open RigoOnRails opened 8 years ago

RigoOnRails commented 8 years ago

Colors and text overlap each other.

Theme overlapping

mattmeng commented 8 years ago

I'm experiencing this as well. The conflict UI coloration is weird and when you have the pane split down, the conflict UI is drawn over the opposing pane.

superlin commented 8 years ago

counterbeing commented 8 years ago

+1 But, great package!

nprintz commented 8 years ago

vi-cat commented 8 years ago

smashwilson commented 7 years ago

:wave: Thanks for taking the time to file an issue here! Unfortunately, this repository is being deprecated, so I won't be getting to this one here.

This one should be taken care of by the new git and GitHub package for Atom which uses block decorations rather than overlay decorations and JavaScript fussiness for its conflict controls. If you do see something similar, please file an issue there to let us know. Thanks 🙇