[Bf-cycles] Merging master branch into my branch

Dalai Felinto dfelinto at gmail.com
Mon Jul 25 13:09:28 CEST 2016


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.


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
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.blender.org/pipermail/bf-cycles/attachments/20160725/ffaae3ef/attachment.htm 

More information about the Bf-cycles mailing list