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

You could use Gitflow. I think the 'hotfix' handles your scenario.