Stupid question about github and merging two branches.

3    12 Dec 2016 03:49 by u/TH3_1D10T

Ok, so I need to merge two branches. I've already made sure that any merge conflicts wouldn't happen by pulling/pushing between the two branches. Now, neither of the two branches are main, and I need to merge one into the other. What would be the command on the command line look like?

4 comments

3 u/SpottyMatt 12 Dec 2016 03:54

What's wrong with

git checkout branch1
git merge branch2

?

If you want to play it safe, try 

git checkout branch1
git checkout -b trymerge
git merge branch2
0 u/TH3_1D10T [OP] 12 Dec 2016 03:56

What's wrong with

I haven't played with git much in the past, and I want to make sure I don't fuck everything up and make more work than necessary.

0 u/TH3_1D10T [OP] 12 Dec 2016 03:57

Thank you, BTW.

2 u/GIF-lLL-S0NG 12 Dec 2016 03:52

git-merge https://www.kernel.org/pub/software/scm/git/docs/git.html