merge-conflicts icon indicating copy to clipboard operation
merge-conflicts copied to clipboard

Published 20 hours ago • verified publisher icon smashwilson

Doesn't work with the 'Seti' theme

Open RigoOnRails opened this issue 8 years ago • 6 comments

Colors and text overlap each other.

Theme overlapping

RigoOnRails avatar Jun 06 '16 01:06 RigoOnRails

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.

mattmeng avatar Jun 08 '16 00:06 mattmeng

+1

superlin avatar Jun 12 '16 06:06 superlin

+1 But, great package!

counterbeing avatar Jun 13 '16 06:06 counterbeing

+1

nprintz avatar Jun 30 '16 01:06 nprintz

+1

vi-cat avatar Jul 05 '16 17:07 vi-cat

: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 🙇

smashwilson avatar May 16 '17 19:05 smashwilson