First, checkout the branch you want to merge in, then run:
git merge branch-from
Merges the commits from "branch-from" into the currently checked out branch.
Search Git Commands | More How Tos
