From 9489119e6669059bad85418b449a28996236185e Mon Sep 17 00:00:00 2001 From: Mark Goddard Date: Wed, 15 Dec 2021 17:27:35 +0000 Subject: [PATCH] README: add info about consuming updates to this config --- README.rst | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/README.rst b/README.rst index bdf023cde..9f4bde753 100644 --- a/README.rst +++ b/README.rst @@ -65,6 +65,22 @@ need to merge the changes in this repository into your repository. git fetch stackhpc git merge stackhpc/stackhpc/wallaby +Updating +-------- + +This base configuration will be updated over time, to update repository +versions, container image tags, and other configuration. Deployments may +consume these updates by merging in the changes with their local configuration. + +.. code-block:: console + + git fetch stackhpc + git merge stackhpc/stackhpc/wallaby + +The intention is to avoid merge conflicts where possible, but there may be +cases where this is difficult. We are open to discussion on how best to +approach this on both sides. + Configuration =============