search

smashwilson / merge-conflicts

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

Conflict detection doesn't work if no conflict in the first project folder on 1.4.x #228

Closed emileber closed 7 years ago

emileber commented 8 years ago

it doesn't work if there are no conflicts in the first project folder.

I get the following notification (on version 1.4.1):

Nothing to Merge No conflicts here!

I played around swapping the order of the project folder and it works only if the conflicts are on the first project folder.

I reverted to 1.3.7 and it detects the conflicts if I open a file of the project. So the problem exist only in 1.4.x

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 where we have a bunch of logic to follow the "active" project (use a single project if there's only one, follow the active pane, etc). If you see something similar, please file an issue there to let us know. Thanks 🙇

emileber commented 7 years ago

It's cool, thanks for taking the time to inform me. I didn't really needed to use multiple projects per atom instance and instead used multiple atom instance, one for each project.