While 2.8 should only get bug fixes, master gets developed so 2.8 and master can diverge sign8ficantly and in fact should.
It's the divergence that complicate merges. It's easy to cherry pick a 2.8 fix that will merge easily to master. This also avoid having to merge others work that I wouldn't know the proper changes. For work that doesn't merge easily ...then separate commits to each branch is much easier. Sent from my Galaxy -------- Original message -------- From: andy pugh <bodge...@gmail.com> Date: 2022-09-25 10:23 a.m. (GMT-08:00) To: EMC developers <emc-developers@lists.sourceforge.net> Subject: Re: [Emc-developers] Merging 2.8 into Master On Fri, 23 Sept 2022 at 01:50, Chris Morley <chrisinnana...@hotmail.com> wrote: > We could avoid any merge problems by changing our policy to not merge stable > branches into master. > It seems to me that cherry picking or preparing separate commits is far > easier and less error prone then what we are doing. In theory the stable branch should only get bug-fixes, and these should always be not only safe but also required upstream. So the question is more, "why have we got things in 2.8 that do not belong in master" There is a difference at the moment as I have introduced a reduced version of the 7i96S support into 2.8. -- atp "A motorcycle is a bicycle with a pandemonium attachment and is designed for the especial use of mechanical geniuses, daredevils and lunatics." — George Fitch, Atlanta Constitution Newspaper, 1912 _______________________________________________ Emc-developers mailing list Emc-developers@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/emc-developers _______________________________________________ Emc-developers mailing list Emc-developers@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/emc-developers
