cherry-pick a commit to master seems unavoidable in my case, how do I mitigate its impact?

Question

We have a master and 2 dev branches in git. The master is actually the release branch that we build our product to the customer and one dev branch is for the next release, t