[Bf-cycles] Merging master branch into my branch

[Antony Riakiotakis]

As soon as you commit anything to a public branch in origin, rebasing is
not a good idea - it will flood the mailing lists with all commits merged.
So, since you have already pushed your branch in a public repository, use
merging.

On 25 July 2016 at 14:21, "Pascal Schön" <pascal_schoen at gmx.net> wrote:

> Hey,
>
> thanks for your reply. I know what the difference between merge and rebase
> is. But as it is described in the wiki, the history should be kept linear.
> Or is this linearity only mandatory for the master branch?
>
> Pascal
>
> *Gesendet:* Montag, 25. Juli 2016 um 13:09 Uhr
> *Von:* "Dalai Felinto" <dfelinto at gmail.com>
> *An:* "Discussion list to assist Cycles render engine developers" <
> bf-cycles at blender.org>
> *Betreff:* Re: [Bf-cycles] Merging master branch into my branch
>
> Hi,
>
> You are trying to 'rebase' instead of 'merge'. Look it up the difference,
> what you want is to 'merge'.
>
> Rebase is only used for the final patch before committing it to master.
>
> Regards,
> Dalai
>
> On Jul 25, 2016 04:34, Pascal Schön <pascal_schoen at gmx.net> wrote:
>>
>> Hi,
>>
>> I've got one question on merging the master branch into the
>> cycles_disney_brdf branch. I'd like to have the current implementation of
>> the multiple scattering GGX in the Disney BSDF. ;-)
>> But here's the thing: If I do it like it is described here
>> https://wiki.blender.org/index.php/Dev:Doc/Tools/Git, all of the commits
>> in cycles_disney_brdf will be placed above the commits of the master branch
>> (because of the rebase). But then every commit (also those that have
>> already been pushed before) is published via the mailing list. Or am I
>> wrong here?
>>
>> What is the best practise to do this?
>>
>> Pascal
>>
>> _______________________________________________
>> Bf-cycles mailing list
>> Bf-cycles at blender.org
>> https://lists.blender.org/mailman/listinfo/bf-cycles
>>
>
> _______________________________________________ Bf-cycles mailing list
> Bf-cycles at blender.org https://lists.blender.org/mailman/listinfo/bf-cycles
>
> _______________________________________________
> Bf-cycles mailing list
> Bf-cycles at blender.org
> https://lists.blender.org/mailman/listinfo/bf-cycles
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.blender.org/pipermail/bf-cycles/attachments/20160725/4b63a90a/attachment.htm