On Thu, 15 Feb 2024 08:53:35 GMT, Julian Waters <jwat...@openjdk.org> wrote:
> This is not going to be fun to rebase on top on in my port :( Apologies. :( But I think it might not be that hard either, if you do it correctly. That was one of my goals by keeping the order so strict, to facilitate this kind of merges. Basically, you can consider each of the new files as a copy of the original NativeCompilation.gmk. So take your version of NativeCompilation.gmk, and copy it once for each of the new files. And then if you use a good diff tool (personally, I prefer Meld), it will show the "deleted" parts, and you can just delete them, and any changes you have done to individual lines will be kept in the "saved" parts. This assumes that you have only made a bit of change here and there; if you have reordered stuff or whatever, then you're in trouble. I hope you understand what I mean; ask if I did not express myself clearly enough. ------------- PR Comment: https://git.openjdk.org/jdk/pull/17849#issuecomment-1945800763
