News for hackers. Stuff that matters.
Re:Git and GitHub Integration Comes to Atom by easychris on Tuesday May 16, 2017 @03:39PM (#14352587)
Just today the author of the "merge-conflicts" package for Atom emphasized that his plugin is depcrecated because Atom 1.8 will have that feature included by default.

https://github.com/smashwilson/merge-conflicts/commit/f61950...

https://github.com/smashwilson/merge-conflicts/blob/master/d...

Re:Git and GitHub Integration Comes to Atom by damieng on Tuesday May 16, 2017 @10:56PM (#14355273)
Yeah, he's now a developer on Atom and worked on the GitHub package...