Merge branches.

# To merge a branch with your current branch:
git merge branch_name

# To edit the merge message:
git merge -e branch_name