search

smashwilson / merge-conflicts

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

Nothing to merge #243

Open ayberkozgur opened 8 years ago

ayberkozgur commented 8 years ago

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 commented 7 years ago

Same for me, file clearly show merge conflict marks.

I hadd to rollback plugin to 1.3.7 because of this: https://github.com/smashwilson/merge-conflicts/issues/231

nataliefl commented 7 years ago

Same issue here

JaguarDown commented 7 years ago

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 commented 7 years ago

Same thing is happening for me.

gaopin1534 commented 7 years ago

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

smashwilson commented 7 years ago

:wave: 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 🙇