[Bf-committers] Please don't rebase @compositor-2016

Jeroen Bakker j.bakker at atmind.nl
Thu Jun 9 13:42:42 CEST 2016


Sorry about that.

I was looking for docs on the wiki what described how to rebase/merge 
master into a feature branch. But could not find it. Is there any docs 
in the wiki about this?

For now on I will do a merge.

Jeroen.

On 06/09/2016 09:12 AM, Sergey Sharybin wrote:
> 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 <blender at dingto.org> 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
>> Bf-committers at blender.org
>> https://lists.blender.org/mailman/listinfo/bf-committers
>>
>
>



More information about the Bf-committers mailing list