git merge other-branch -m "Commit Message" --no-ff