At the risk of starting a discussion... 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.
Chris ________________________________ From: andy pugh <bodge...@gmail.com> Sent: September 22, 2022 9:54 PM To: EMC developers <emc-developers@lists.sourceforge.net> Subject: [Emc-developers] Merging 2.8 into Master I just tried to (locally) merge 2.8 into Master. I decided to use the "ours" strategy so that nothing actually changed, all I wanted to do was mark them as merged, without changing anything, Looking at the dry-run patch, though, quite a lot seemed to change, though comparing the patches to the current master on github, most of the changes seemed to already be included. So I am puzzled. Especially as Hans merged on the 16th September. Is there anything in 2.8 that _should_ be merged up to Master? -- 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
