$ git checkout master
Switched to branch 'master'
$ git merge --no-ff hotfix-1.2.1

$ git checkout develop
Switched to branch 'develop'
$ git merge --no-ff hotfix-1.2.1