Colored Conflict Bars display over other panels

smashwilson / merge-conflicts

Resolve git merge conflicts in Atom

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

MIT License

432 stars 42 forks source link

Colored Conflict Bars display over other panels #261

Open rpennell opened 7 years ago

rpennell commented 7 years ago

The colored bars stating the code origin from HEAD, master, etc display on top of other panels. If Atom tree view is open, the bars will temporarily display over that. If the merge-conflict panel is open, the bars will temporarily display over that. It looks like this is mostly due to the animation on open, but some still persist. You can see that its overlaid on minimap and part of the Atom window below

screenshot from 2017-02-25 11-20-56

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. If you see something similar, please file an issue there to let us know. Thanks 🙇