Update 1.3.5 is broken?

smashwilson / merge-conflicts

Resolve git merge conflicts in Atom

https://atom.io/packages/merge-conflicts

MIT License

432 stars 42 forks source link

Closed gustaflindqvist closed 8 years ago

gustaflindqvist commented 8 years ago

The update from 1.3.4 to 1.3.5 is not working for in Atom.app on Mac OS X. Atom is trying to update but it's just loading.

If I uninstall the plugin and reinstall the current version is 1.3.4.

smashwilson commented 8 years ago

Well that's no good.

Can you update from the command line?

apm install merge-conflicts

gustaflindqvist commented 8 years ago

@smashwilson I was able to use:

apm update merge-conflicts

Then Atom updated the package to 1.3.5. :+1:

smashwilson commented 8 years ago

This one was related to settings-view/apm bug, which I've seen sporadically myself. Thanks for the report!