git merge <branchname>
Merge branch into the current branch
git merge <branchname1> <branchname2>
git merge --no-ff <branchname>