On Tue, Jan 11, 2022 at 10:44:56PM +0100, Thomas Koenig wrote: > > > So... time to merge the branch into trunk before stage 4 > > > kicks in? > > > > IMHO yes. We need to git merge master; git rebase of course > > before trying to cherry-pick those commits into trunk and pushing there. > > I would prefer if somebody else did this - my lack of git-fu would > forseeably lead to some unforseen problems :-)
My git-fu is limited too, but I've pushed it to trunk now. Jakub