smashwilson / merge-conflicts

Resolve git merge conflicts in Atom
https://atom.io/packages/merge-conflicts
MIT License
432 stars 42 forks source link

Headers break out of the file's pane #251

Closed kevinansfield closed 7 years ago

kevinansfield commented 7 years ago

When using multiple panes the diff headers break out of the diff's pane and the action buttons end up sitting on top of an unrelated pane.

screen shot 2016-09-27 at 11 10 43

Atom: 1.10.2 UI Theme: One Dark merge-conflicts: 1.4.4

thisolivier commented 7 years ago

I can confirm the same issue with different themes.

screen shot 2016-12-15 at 17 37 16

Atom 1.12.7 UI Theme: Seti UI Syntax Theme: Fictus Light

smashwilson commented 7 years ago

Duplicate of #256, and this repository is being deprecated, so I won't be getting to this one here.

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