Answer by Ray for Performing git merge in atom editor without the terminal
You're right, there is no merge function in Atom out of the box. Someone had raised an issue last year and it's not resolved.There's a 3rd party package that lets you do this, though -...
View ArticlePerforming git merge in atom editor without the terminal
My favorite editor atom has nicely integrated adding, committing, pushing and pulling with git. But where is the merge function? Is it possible to do this without the terminal? With atom out of the box...
View Article