search

smashwilson / merge-conflicts

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

UI disappears #224

Open irudoy opened 8 years ago

irudoy commented 8 years ago

When I open the file, UI appears for a moment, but then disappears.

merge-conflicts-bug

smashwilson commented 8 years ago

Do you have editor-config installed as well? See #196 for details if you do.

Are you on Windows? If so, #227 may be what you're encountering instead.