git merge

Merge branches. More information: https://git-scm.com/docs/git-merge.

git merge branch_name

git merge --edit branch_name

git merge --no-ff branch_name

git merge --abort

git merge --strategy strategy --strategy-option strategy_option branch_name