Blog post

[alessandrobenedetti]

From staging to prod

[alessandrobenedetti]

@janhoy apparently there are conflicts, not sure why this could happen?

Also I noticed that It didn't squash the commits from the blog pull request, is it something we don't do for the site?
Normally it does it automatically for the solr code

[janhoy]

@janhoy apparently there are conflicts, not sure why this could happen?

Also I noticed that It didn't squash the commits from the blog pull request, is it something we don't do for the site? Normally it does it automatically for the solr code

We do not squash commits for website, but use merge commit. The file asf.yaml SHALL be different between the branches, that's why there is a conflict. Will try to resolve.

[janhoy]

Resolved!

[alessandrobenedetti]

hi @janhoy when are we supposed to see the changes online?
I took a look this morning and it's not there yet?

[janhoy]

hi @janhoy when are we supposed to see the changes online? I took a look this morning and it's not there yet?

https://solr.apache.org/blog.html