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. Thanks, Bastien _______________________________________________ Bf-committers mailing list [email protected] https://lists.blender.org/mailman/listinfo/bf-committers
