Alternatives to cherry-picking

Question

We have a master and a production branch. The master branch contains current developments while the production branch contains the stuff that is running on the s

Answer 1

Create a separate branch for each hotfix, and merge it into both your development branch and your production branch.

The gitflow model works really well in general, and I'd recommend checking this out: http://nvie.com/posts/a-successful-git-branching-model/

Your master branch is analogous to their develop branch, and your production branch is analogous to their master