smashwilson / merge-conflicts

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

UI conflicts with tree view when docked on the right side #256

Open mikemerritt opened 7 years ago

mikemerritt commented 7 years ago

The UI for merge-conflicts does not contain itself to the current buffer and instead takes up the full window width when the tree view is docked on the right side. The buttons are unclickable and I have to resize the tree view to expose the buttons properly.

screen shot 2016-12-06 at 3 02 40 pm

thisolivier commented 7 years ago

Related to issue #251 I think.

mikemerritt commented 7 years ago

Yes, it seems this is related to #251

pdf13 commented 7 years ago

This issue is also related to #261

nerdgore commented 7 years ago

Also related to #264

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 🙇