Den sön 22 dec. 2024 kl 22:10 skrev Nathan Hartman <hartman.nat...@gmail.com >:
> On Sun, Dec 22, 2024 at 2:58 PM <dsahlb...@apache.org> wrote: > > > > Author: dsahlberg > > Date: Sun Dec 22 19:58:14 2024 > > New Revision: 1922638 > > > > URL: http://svn.apache.org/viewvc?rev=1922638&view=rev > > Log: > > In site/staging: > > Catchup merge from trunk > > From publish, maybe? (Sorry to nitpick! :-) > Oh. The log message says 'publish' now ;-) > > By the way, did it give you any trouble with this catch-up? I had a > rather interesting time with r1922147 so I hope merges in the site are > easier now... > Yes, I got conflicts on index.html (where it claimed the news article about 1.14.5 was in conflict although I added it first in staging and then merged to trunk) as well as on the advisories. I pushed through and hope the mergeinfo is correct now.. Cheers, Daniel
