From f7980f6a64a6107aefd16cd7396a47b461700f45 Mon Sep 17 00:00:00 2001 From: Finbar Cowan Date: Wed, 8 Oct 2025 23:43:49 +0100 Subject: [PATCH 1/2] Enhance README with Vitalis branch instructions Added instructions for working with the Vitalis branch in the README. --- README.md | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/README.md b/README.md index 6049338..8d1ea19 100644 --- a/README.md +++ b/README.md @@ -7,6 +7,37 @@ This readme provides you with the instructions for installing the lab requiremen These instructions are very similar to the [tutorials instructions](https://github.com/ediadvancedrobotics/tutorials). ## Set up +## For **Vitalis** +just type the following in the base of the repo +```bash +git branch +``` +**If you are in the master branch do the following (the branch you are in will be in green text):** +``` bash +git add . +git commit -m "Commit Message" +git checkout vitalis +git merge master +git push origin vitalis +``` +Then continue on making edits in the vitalis branch. + +**If you are in the vitalis branch do the following:** +``` bash +git add . +git commmit -m "Commit Message" +git push origin vitalis +``` + +**If we are merging our branches together, make sure you are in the vitalis branch, then:** +```bash +git checkout vitalis +git add . +git commit -m "Vitalis Merge Message" +git checkout master +git merge vitalis +``` +**Then we can discuss how to handle merge conflicts.** ### On a DICE machine On DICE, we will clone the [lab repository](https://github.com/ediadvancedrobotics/lab) and install the required [dependencies](https://github.com/ediadvancedrobotics/lab/blob/main/requirements.txt). From 3857dfed727ef780a6ca5132fbae7f78bd80cba9 Mon Sep 17 00:00:00 2001 From: pyskinas Date: Tue, 14 Oct 2025 14:16:40 +0100 Subject: [PATCH 2/2] made little change --- lab_instructions.ipynb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lab_instructions.ipynb b/lab_instructions.ipynb index 17ed877..36b3060 100644 --- a/lab_instructions.ipynb +++ b/lab_instructions.ipynb @@ -175,7 +175,8 @@ "metadata": {}, "outputs": [], "source": [ - "hasattr(viz.viewer, 'jupyter_cell') and viz.viewer.jupyter_cell()" + "hasattr(viz.viewer, 'jupyter_cell') and viz.viewer.jupyter_cell()\n", + "print(\"made a change\")" ] }, {