Re: [Emc-developers] Merge Strategy

2022-11-28 Thread Chris Morley
Strategy is just the agreed upon approach we use in the project. Currently our strategy is to merge up released branches up to master. In practice we almost always just merge up the last last release branch up to master. See my answer to Seb for morexdetails of my reasoning of why I think we

[Emc-developers] In ~2h: Next LinuxCNC video chat

2022-11-28 Thread Steffen Möller
Quick reminder > [Petter Reinholdtsen 2022-11-11] > > The next LinuxCNC video chat is scheduled for 2022-11-28 19:00 UTC > > (19:00 London time, 20:00 Central Europe time). Same location as last > > time: > > > > https://meet.jit.si/LinuxCNC-meeting-november-2022 Best, Steffen

Re: [Emc-developers] Merge Strategy

2022-11-28 Thread Steffen Möller
> Gesendet: Montag, 28. November 2022 um 06:43 Uhr > Von: "Chris Morley" > An: "EMC developers" > Betreff: Re: [Emc-developers] Merge Strategy > > Can you explain why merging up is better then cherry-picking or separate > commits? @Seb explains this better, my short answer would be that it