Объединить две ветви в команде GIT
git merge existing_branch_name
git merge --no-ff existing_branch_name
akileus
git merge existing_branch_name
git merge --no-ff existing_branch_name