Fusionar dos ramas en el comando 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