search

smashwilson / merge-conflicts

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

In conflict resolution, branch name get over the rest if the UI. #209

Closed Succo closed 8 years ago

Succo commented 8 years ago

When you have the part of your UI where branch name are come over other panels when those panel are over text with merge issue.

I think the attached file illustrate it better than me.

screen shot 2016-02-24 at 6 39 38 pm
rajashekar007 commented 8 years ago

Yes, I came here to report the same thing. :+1:

rajashekar007 commented 8 years ago

188 covers this, duplicate bug.

smashwilson commented 8 years ago

Yup, this is a duplicate of #188; please subscribe there for updates.