[Bf-committers] Blender 2.8 branch merge to master

Brecht Van Lommel brechtvanlommel at gmail.com
Fri Dec 21 16:36:33 CET 2018

This has now been done. You should be able to commit a merge from
blender2.7 into master, but not from any other branch.

In practice I expect the amount of those merges to get less over time, only
for bug fixes and build system stuff. Clean up commits can go directly to

On Fri, Dec 21, 2018 at 1:12 PM Brecht Van Lommel <brechtvanlommel at gmail.com>

> We ran into a small issue.
> Currently committing merges is disallowed on the master branch, which
> makes merging from blender2.7 to master fail. I'm going to add an exception
> to allow merging from the blender2.7 branch (but nothing else).
> Otherwise committing to both branches is fine to do now, just the merging
> doesn't work at the moment.
> On Fri, Dec 21, 2018 at 12:26 PM Brecht Van Lommel <
> brechtvanlommel at gmail.com> wrote:
>> Hi all,
>> 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.
>> Regards,
>> Brecht.

More information about the Bf-committers mailing list