On Fri, 2 Dec 2022 at 04:38, Sebastian Kuzminsky <s...@highlab.com> wrote:
> I'm merging 2.8 into 2.9, and I came across a spot where it looks like a > feature was added independently to both 2.8 and 2.9 (7i96s support in > pncconf), and a bunch of bugfixes were applied in 2.9 but not 2.8. I was going to do that merge too, as I am responsible for the somewhat unusual process. In fact I planned it for yesterday but got engrossed in trying to get LinuxCNC-rt debs building. Basically 7i96s support in hm2 and pncconf was in 2.9 but not 2.8. Then the chip shortage meant that the 7i96s was just about the only board readily available, so I cherry-picked just enough to support the board from 2.9 to 2.8 for the 2.8.4 release. To solve the conflicts there I believe that the best strategy is to leave the 2.9 version as-is (ie checkout --ours) for hm2 and pncconf. -- 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
