jtulach commented on PR #8492: URL: https://github.com/apache/netbeans/pull/8492#issuecomment-2868964015
> Eric has 26-rc3 ready to roll as far as I know, so this is too late for that. _If_ there is an rc4 and _if_ this gets assessed as high priority ... maybe this gets in. - OK, if there is RC4 please consider this PR for merging into release 26 - so far the commit 847808d is working fine in master - if the commit won't make it into release 26 - the fix will at least be part of NetBeans 27 Maven bits > Fixes go via delivery into master, not the other way around. - Merging this PR will not create any conflicts - Git handles multiple merges of the same commit elegantly - The same commit 847808d is just going to be merged (if this PR gets accepted) twice - it has already been merged to `master` - this PR proposes to merge it into `delivery` - merging `delivery` to `master` will be a no-op for Git with respect to this commit - it may not be the order of steps you are used to, but there is nothing wrong with it - typical workflow based on DAG nature of Git commits -- 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: notifications-unsubscr...@netbeans.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org --------------------------------------------------------------------- To unsubscribe, e-mail: notifications-unsubscr...@netbeans.apache.org For additional commands, e-mail: notifications-h...@netbeans.apache.org For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists