[Bf-committers] How to maintain for master and blender2.8 in parallel?

[Howard Trickey]

Is the person who committed a change to master also expected to do the
merge of those changes to blender2.8, or do the "several times a day"
merges naturally pick up all changes committed to master recently?

On Wed, Jan 31, 2018 at 7:02 AM Bastien Montagne <montagne29 at wanadoo.fr>
wrote:

> Hi Gaia,
>
> You should just commit to master, and then merge master in blender2.8,
> that’s how we deal with fixes that should go to both.
>
> In fact, blender2.8 remains totally based on master for now, we do
> merges several times a day usually, to ensure it keeps manageable. :)
>
> Cheers,
> Bastien
>
>
> Le 31/01/2018 à 12:53, Gaia Clary a écrit :
> > Hi;
> >
> > I would like to apply a few fixes to the master branch and to the
> > blender2.8 branch in parallel. But i do not know a good way to apply
> > those fixes in a correct way. Is there a general workflow for this?
> >
> > I thought of fixing in master, then cherry-pick the commits to
> > blender2.8 Is that the right way to go? Or do i just do my fixes in
> > master and blender2.8 separately? Or is there yet another way to do it?
> >
> > Please can i get an advise?
> >
> > cheers,
> > Gaia
> >
> > _______________________________________________
> > Bf-committers mailing list
> > Bf-committers at blender.org
> > https://lists.blender.org/mailman/listinfo/bf-committers
> >
>
> _______________________________________________
> Bf-committers mailing list
> Bf-committers at blender.org
> https://lists.blender.org/mailman/listinfo/bf-committers
>