search

smashwilson / merge-conflicts

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

Merge conflicts interface disappears when going to next file #208

Open adamreisnz opened 8 years ago

adamreisnz commented 8 years ago

It refuses to show when going to the next file. Have to quit the merge conflicts panel, and then find merge conflicts again with the relevant file open before it shows the interface again.

This is on Atom 1.6.0-beta5, OS X.

jdinartejesus commented 8 years ago

I'm also having the same issue as @adambuczynski and i'm using Atom 1.5.4 and OS X.

trainerbill commented 8 years ago

+1 same issue on 1.5.3 on ubuntu

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.

adamreisnz commented 8 years ago

Yes, I do have editor-config installed. I will have a look soon and see if it's still happening with the latest versions of both packages.

adamreisnz commented 8 years ago

I don't know, I can't manage to test this. I've tried to create merge conflicts in two files, but then it only picked up one of the files. I'll wait till I have an actual real merge conflict in multiple files happening and will then retest again.