Merge branches.

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

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

# To merge a branch and create a merge commit:
git merge --no-ff <branch_name>

# To abort a merge in case of conflicts:
git merge --abort