[Bf-committers] Blender 2.8 branch merge to master
Brecht Van Lommel
brechtvanlommel at gmail.com
Fri Dec 21 12:26:08 CET 2018
The git branches for the Blender and addons repositories have been renamed:
* blender2.8 -> master
* master -> blender2.7
We keep supporting blender2.7 to more or less the same (minimum) level as
before, to ensure there is a production-ready Blender version being
maintained. Buildbot continues to build both.
For those building Blender themselves, you can check out the different
branch name. Do not use the "blender2.8" branch anymore. If you were
previously building 2.8, you can do this:
git checkout master
git branch -D blender2.8 # delete so we don't accidentally use it
make update # update addons to the right version
For developers, changes should be simple. Effectively you can just use the
new branch names in all git commands. If you had any changes in the
blender2.8 branch, you can cherry-pick them into master.
If you have a feature branch that was based on blender2.8, you do "git
rebase master" to rebase it, and there should be no conflicts.
If anything is unclear, ask here or in IRC.
More information about the Bf-committers