Skip to content

Upgrading v0.0.0 Template

James Heselden edited this page May 29, 2024 · 4 revisions

How to upgrade from version v0.0.0 (unversioned) to version v1.0.0 (released 28 May 2024).

This is a simple guide, if you need further assistance please open an Issue.

  1. Clone LCAS/main using:

git clone https://github.com/LCAS/environment_template --single-branch -b main

  1. Add your template branch as a remote:

git remote add rih https://github.com/Iranaphor/riseholme_hall_rooms

  1. Checkout the branch you wish to upgrade:

git checkout rih0012

  1. Merge the changes of the template into the environment. At the point of instantiating a template, the git history will be only an Initial Commit, thus the branches cannot be merged directly. On merging them, all history of main will be copied into your instantiated template. To allow merging, the argument of --allow-unrelated-histories must be used:

git merge main --allow-unrelated-histories

  1. This will highlight all of the changes made to main from the point of instantiation. Add the changes, commit and push back to your repository.