github Merge 2 branches

Hi,

First of all, congrats for the atom integration with gitlab.

My "problem" at this point: I can do "git checkout branch" on the selector in atom. i can do "git pull" and "git push" on the button on atom. The only thing i need to do outside atom is the command "git merge branch". Even after i run that command i go to atom again for merge conflicts.

If there any way i can run that command inside atom?

Jun 05 '18 00:06 akarupt

hi @akarupt

I believe you are correct, that Atom's git integration doesn't currently support the functionality for merging branches.

Jun 18 '18 21:06 annthurium

@akarupt I use a terminal like platformio-ide-terminal to do the umpteen non supported tasks from GH package vs git, I know no other way even with git-plus etc packages that all fall short one way or another.

Interactive rebases works fine in this way as well as branch merges etc and anything else since via terminal youre talking to git directly and GH package picks up the rest to do the staged/unstaged diffs etc etc.

Im from the opinion that a terminal is essential in Atom when dealing with Git and that no UI extension is ever going to be as powerful as command line.

Jul 19 '18 15:07 the-j0k3r

Would love to have branch merging available in this package. As it is, GitHub Desktop can't deal with Conflicts, but can merge. Atom can't merge, but can deal with merge conflicts. So I have to use both whenever I want to merge AND deal with merge conflicts. It would be great to have merging available in this Git and Github Atom package.

Jul 25 '18 19:07 JosephTLyons

Merging branches in atom would be great, especially since atom already supports working with different branches. It seems a little bit odd that that's possible, but the merging tool is missing. And the merge conflict resolution in atom is just amazing - I'd preferably be able to deal with everything in there rather than having to go back and forth between github desktop / git cmd and atom.