On Mon, 2 May 2022 at 17:11, Matthias Bläsing <[email protected]> wrote: > https://github.com/apache/netbeans/pull/4032 > > both PRs show this line: > > ebarboni force-pushed the delivery branch from 74e1e5f to 217f7df 4 days ago > (2022-04-28 13:58 CEST)
Looking at #4032 and specifically https://github.com/apache/netbeans/pull/4032#issuecomment-1112118353 something has probably gone awry in getting #4010 into delivery. That should perhaps have just gone straight to release140 anyway. Or via delivery and handled in the merge to master. I guess Eric's local branch wasn't completely up-to-date when that was done? Either way, there shouldn't normally be a need to force push to delivery (there's a couple of unlikely circumstances where we might consider it). And using this to figure out and document the safest way to cherry pick from master to releaseXXX (via delivery or not) on the rare occasion we need to do that might be good. No harm done - all good learning! :-) Best wishes, Neil --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected] For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
