search

smashwilson / merge-conflicts

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

Going to next issue doesn't show UI #183

Open seriema opened 8 years ago

seriema commented 8 years ago

Easier to explain with screenshots. This is my first time using it and I just installed it (1.3.6). I had three issues in two files which it detected correctly. I got the nice UI view and fixed the first issue, but couldn't get it to do the same for the second/third issue that were in the other file. After restarting Atom and rerunning merge-conflicts I got it to display correctly. Sorry the screenshot showed two different areas of the same file, but it wasn't displaying the UI in neither part of that file.

Not working after fixing the first issue:

screenshot 2015-09-23 18 19 40

Working after restarting Atom and rerunning merge-conflicts:

screenshot 2015-09-23 18 26 17
smashwilson commented 8 years ago

Weird. That certainly sounds like a parsing bug. Was there a stack trace in the console?

seriema commented 8 years ago

Hmm sorry I didn't check. I remember some "report bug" feature in Atom and looked for it but didn't find it. So this is all I've got unless there's some logs I can find or if you want help in reproducing it?