Maybe my question is not well-formed.
The situation is this: we have 3 public branches: dev, qa, master.
I need to commit an urgent fix to the master
, but the dev
and the qa
branches are already ahead of the master
by a few commits.
What is the cleanest method to make a patch, and apply it to the master
branch, as well as to all the branches?
EDIT:
Since many comments suggested cherry-picking, I would like to emphasize that I haven't committed the fix yet. I want to avoid cherry-picking, so if there's a better way of doing it, I would be happy to hear (maybe commit the fix on the master
and then rebase qa
and dev
)