vy commented on code in PR #480:
URL: https://github.com/apache/logging-parent/pull/480#discussion_r3258099327
##########
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:
@ppkarwasz, I think we should truncate and bootstrap `main-site-pro` from
`rel/7.8.0`, instead of merging `rel/7.8.0` to the current state of
`main-site-pro`, since the latter results in an unknown state. WDYT?
FWIW, I don't know what _"truncate and bootstrap"_ exactly translate to, but
we can figure that detail out. The point is, after this operation
`main-site-pro` should be identical to `rel/7.8.0`.
--
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]
