Think what's happened is that it was a proper merge but then Atmind used `git pull --rebase` which flattened the branching.
So do not sue pull --rebase while having uncommitted merge! After discussion with Campbell in IRC it doesn't seem there's easy and convenient for everyone way of preventing such a mass spam. It doesn't happen so often anyway. But i went ahead and limited number of emails per push to 64 (was 500 before). On Thu, Jun 9, 2016 at 8:54 AM, Thomas Dinges <[email protected]> wrote: > Hi Jeroen, > please dont rebase branches... that just leads to hundreds of mails > everyone gets. Do a merge instead. > > Best regards, > Thomas > _______________________________________________ > Bf-committers mailing list > [email protected] > https://lists.blender.org/mailman/listinfo/bf-committers > -- With best regards, Sergey Sharybin _______________________________________________ Bf-committers mailing list [email protected] https://lists.blender.org/mailman/listinfo/bf-committers
