On 2022-02-07 04:38, Arvid Brodin wrote:
* Your "tp module interface provisions" moves joint and axes into emcmot_status_t to be able to access it from tp, I think? My patch instead uses access functions in tp.c to get acc and vel limit data. This is the tricky commit which would have merge conflicts. In general, everything related to emcmotStatus would have to go
... and TBH I have no idea what I meant by this. The more I look, the less of a problem it seems it would be to rebase your changes upon mine. Some merge conflicts for sure, but nothing major I think? I guess one would have to actually do it to know for sure though. :) I'm no git expert but since your commits are part of the official repo already, perhaps I should try? To rebase your branch upon mine, I mean. Hmm... it should be possible for me to do that in my local repo, right? Although we should make sure we're rooted at the same commit in master first, perhaps? But then how do you regain control over the resulting branch to squash the remaining commits as you planned? Maybe it would be easier for you to do a rebase replacing some of your commits with mine? It should be possible if you add my repo as a remote, I think. This sure would be easier for me, haha. :) Anyway, it's way past bedtime here. :) I hope we can solve this somehow. -- Arvid Brodin _______________________________________________ Emc-developers mailing list Emc-developers@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/emc-developers
