[Bf-committers] Please merge your master work in blender2.8 immediately

Bastien Montagne montagne29 at wanadoo.fr
Mon Jul 3 16:37:34 CEST 2017

This is a reminder to all developers : when you commit something in 
master, that goes beyond the oneliner and has even a remote possibility 
of creating a conflict with blender2.8 branch, please handle the merge 
in that branch immediately yourself. Can save a lot of time for someone 
else to figure out what is the issue, what work was done in both 
branches, and how to solve the conflicts.

This could be simplified to: always merge master in blender2.8 after you 
did some commit there.

Also, related: DO NOT make 'cleanup' things like adding/removing spaces 
or blank lines in blender2.8, unless you are rewriting the whole piece 
of code! This can easily create stupid virtual conflicts later. If you 
want to do style or cosmetic cleanup, do it in master, merge in 
blender2.8, and everyone is happy.


More information about the Bf-committers mailing list