Nothing to merge

[ayberkozgur]

Detect pops-up the "No conflicts. Nothing to merge" dialog. Current directory repo has ongoing merge with conflicts and of course, git status confirms this. Using Atom 1.7.4.

[gcaracuel]

Same for me, file clearly show merge conflict marks.

I hadd to rollback plugin to 1.3.7 because of this: #231

[nataliefl]

Same issue here

[JaguarDown]

Same issue for me. Windows 10, Atom 1.10.2, merge-conflicts 1.4.4. Please fix! I really want to use this package! Sorry if I failed at this bug report, first one I've ever done.

[abelta]

Same thing is happening for me.

[gaopin1534]

same here with a swift project
merge-conflicts 1.4.4
atom 1.12.6

[smashwilson]

👋 Thanks for taking the time to file an issue here! Unfortunately, this repository is being deprecated, so I won't be getting to this one here.

This one should be taken care of by the new git and GitHub package for Atom; at least, we have more reliable tests for our git integration. If you do see something similar, please file an issue there to let us know. Thanks 🙇