gemmellr commented on PR #3999: URL: https://github.com/apache/activemq-artemis/pull/3999#issuecomment-1104107531
In addition to the specific comments, and even elaborating on a couple of them needing this, you really do need to rebase your changes against the current main and squash them. Clebert previously gave some advice and even did it for you at one point. If you are still struggling doing that on the existing commits yourself you could just use the [**current diff generated by github**](https://patch-diff.githubusercontent.com/raw/apache/activemq-artemis/pull/3999.diff) from all your changes so far work to apply it to a fresh branch from main (then either update your current branch with that, or even open a new PR from the new branch). I was able to download the diff and apply it directly to the current main by just running `patch -p1 < 3999.diff`, with patch seeming to be able to handle all the divergences itself using fuzz or offsets. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
