smashwilson / merge-conflicts

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

Port to JavaScript and Etch #206

Open smashwilson opened 8 years ago

smashwilson commented 8 years ago

I started this package way back in the days when Spacepen reigned supreme and before ES2015 was really a thing, much less a thing you could use out of the box in Atom. Having played around with ES2015 support in a new package, along with an alternative, React-ish view framework called etch, I'd like to eventually port merge-conflicts over to both. Hopefully, this will make the project a bit more friendly to potential contributors.