ppkarwasz commented on code in PR #480:
URL: https://github.com/apache/logging-parent/pull/480#discussion_r3773494803
##########
src/site/antora/modules/ROOT/pages/release-instructions-project.adoc:
##########
@@ -220,16 +221,17 @@ svn commit -m 'Remove `{project-id}` version `7.8.0`
files released'
[#publish-release-website]
== Publish the release website
-. Merge the `rel/7.8.0` tag (**not** the `release/7.8.0` branch!) to
`main-site-pro` and push it
+. Create a branch from `main-site-pro`, merge the `rel/7.8.0` tag (**not** the
`release/7.8.0` branch!), and push it
+
[source,bash]
----
-git checkout main-site-pro
-git rebase origin/main-site-pro # Sync with the remote repository
-git merge rel/7.8.0 # Pull changes up to the newly created tag
-git push origin main-site-pro
+git checkout -B publish-site/7.8.0 origin/main-site-pro
+git merge rel/7.8.0 # Pull changes up to the newly
created tag
+git push -u origin publish-site/7.8.0
Review Comment:
We can use:
```bash
git push --force-with-lease origin rel/7.8.0:main-site-pro
```
with some exceptions for LTS releases. For an LTS release you need to:
1. First cherry-pick the changelog entry to the “main” branch.
2. Then cherry-pick the same commit to `main-site-pro`.
Basically we are happy to sync the website with the code during a release
(and remove all documentation changes done since the previous one, since those
changes should already be present in the main branch). For LTS releases we only
want to cherry-pick the changelog.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
