How can I painlessly duplicate (merge) my commits from the master branch into the blender-v2.82-release branch?
git checkout blender-v2.82-release
git cherry-pick bb0936969d2a809c0d10e360b59c76e28b5a7f58
Is everything right?
We are in bcon 5, which means you can’t make any changes in 2.82 anymore. The release is already built.
https://wiki.blender.org/wiki/Process/Release_Cycle
For future release, the proper procedure is to commit to blender-v2.82-release and then merge into master, as explained here:
https://wiki.blender.org/wiki/Process/Using_Stabilizing_Branch
If you forgot to do this, then indeed you should cherry-pick it into the release branch and then also merge that release branch into master.
https://wiki.blender.org/wiki/Process/Playbook_Merge_Handling
1 Like