merge-conflicts
merge-conflicts copied to clipboard
Overlapping
The "highlighted lines" overlaps, and they occupying all the width of the screen.
: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 (and CSS written by someone who knows what they're doing) to render the resolution controls instead. If you see something similar, please file an issue there to let us know. Thanks 🙇