jamesnetherton commented on a change in pull request #2412:
URL: https://github.com/apache/camel-quarkus/pull/2412#discussion_r603865621
##########
File path: docs/modules/ROOT/pages/contributor-guide/ci.adoc
##########
@@ -11,6 +11,28 @@
|quarkus-master| To verify camel-quarkus against the latest Quarkus SNAPSHOT
release
|===
+=== Branch maintenance
+
+Some scheduled build jobs (mentioned below) run each day to synchronize
branches `camel-master` & `quarkus-master` with the latest work from the
`master` branch.
+
+Sometimes these jobs fail and it is necessary to fix any issues and manually
rebase the branches. The process for doing this is as follows.
+
+1. Depending on which branch you're rebasing, you may want to begin by
building the latest Camel or Quarkus master branch to avoid pulling in
non-deterministic SNAPSHOT artifacts. Otherwise you can build the branches and
activate the relevant SNAPSHOT repositories via Maven profiles
`-Papache-snapshots` or `-Poss-snapshots`.
Review comment:
Yes - good spot. I updated the wording for that in the latest commit.
--
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.
For queries about this service, please contact Infrastructure at:
[email protected]