On Fri, 20 May 2022, 18:32 Matthias Bläsing, <mblaes...@doppel-helix.eu> wrote:
> Am Freitag, dem 20.05.2022 um 18:04 +0100 schrieb Neil C Smith: > > On Fri, 20 May 2022 at 14:18, Eric Barboni <sk...@apache.org> wrote: > > > I was about to start the process but I can wait. > > > Just this will need RC5 > > > > Was just updating local repo and noticed that master seems to have > > been merged into delivery?! > > > https://github.com/apache/netbeans/commit/65b94aee1ded41d88c8c3fbe997d17d3011df8cd > > > > Might have a problem that needs resolving before anything can be > > merged to delivery or synced to release branch if there is to be an > > rc5. > > > > good eye, indeed looks broken. The good news is, that it is the last > commit in that branch, so fixing history should be trivial in this > case: notify that noone changes delivery, checkout that branch, reset > onto prior commit, force push, notify that delivery is open again and > branches based on delivery need to be recreated by checking it out > again and cherry pick changes onto it. > > This will only affect few (no?) people. Given that we are nearing the > last RC, I expect no open PRs based on delivery. > There is at least the PR also under discussion here which may need updating. Yes, it's an easy enough fix, although I'm still mainly on a sporadic 4G connection until next week, so won't be me. Noticed this while somewhere I had WiFi access and was checking all local branches up to date. Also be good to know the objective of that merge, whether something does need addressing in delivery? Best wishes, Neil
