merge-conflicts icon indicating copy to clipboard operation
merge-conflicts copied to clipboard

Published 20 hours ago • verified publisher icon smashwilson

Merge conflicts interface disappears when going to next file

Open adamreisnz opened this issue 9 years ago • 5 comments

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.

adamreisnz avatar Feb 24 '16 21:02 adamreisnz

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

jdinartejesus avatar Mar 12 '16 14:03 jdinartejesus

+1 same issue on 1.5.3 on ubuntu

trainerbill avatar Mar 13 '16 20:03 trainerbill

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.

smashwilson avatar Apr 25 '16 19:04 smashwilson

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 avatar Apr 25 '16 21:04 adamreisnz

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.

adamreisnz avatar Apr 27 '16 01:04 adamreisnz