Merge branch 'master' into scripting_python_edit

Author: Tom-Willemsen

doc/processes/meetings/Meeting-Roles-and-Rotas.md

@@ -50,24 +50,24 @@ It was decided that we would set up a rota for the various roles in IBEX meeting
  |JH | 04/08/2025 |x |
  |IG | 11/08/2025 |x |
  |CMS | 18/08/2025 |x |
- |DM | 25/08/2025 | |
- |KB | 01/09/2025 | |
- |FA | 08/09/2025 | |
- |GR | 15/09/2025 | |
- |LJ | 22/09/2025 | |
- |LC | 29/09/2025 | |
- |SpC | 06/10/2025 | |
- |DK | 13/10/2025 | |
- |ES | 20/10/2025 | |
- |TW | 27/10/2025 | |
- |SC | 03/11/2025 | |
- |JH | 10/11/2025 | |
- |FA | 17/11/2025 | |
- |DM | 24/11/2025 | |
- |GR | 01/12/2025 | |
- |TW | 08/12/2025 | |
- |ES | 15/12/2025 | |
- |IG | 22/12/2025 | |
+ |DM | 25/08/2025 |x |
+ |KB | 01/09/2025 |x |
+ |FA | 08/09/2025 |x |
+ |GR | 15/09/2025 |x |
+ |LJ | 22/09/2025 |x |
+ |LC | 29/09/2025 |x |
+ |SpC | 06/10/2025 |x |
+ |DK | 13/10/2025 |x |
+ |TW | 20/10/2025 | |
+ |SC | 27/10/2025 | |
+ |JH | 03/11/2025 | |
+ |FA | 10/11/2025 | |
+ |DM | 17/11/2025 | |
+ |GR | 24/11/2025 | |
+ |TW | 01/12/2025 | |
+ |IG | 08/12/2025 | |
+ |? | 15/12/2025 | |
+ |? | 22/12/2025 | |
 
 
 

doc/scripting/instrument-scripts.md

@@ -7,3 +7,14 @@ The general instrument scripts are in this [repository](https://github.com/ISISN
   * Background plot configuration (using {doc}`/specific_iocs/other/Background-Script-IOC` and {doc}`Matplotlib`)
   * {doc}`Zero-field system </specific_iocs/magnets/Zero-field-controller>` calibration routines
   * {doc}`DAE pre & post commands </specific_iocs/dae/DAE-Pre-and-Post-commands>`
+
+## Deployment
+
+During IBEX deployment, an optional step has been added to the deploy script (see [ticket](https://github.com/ISISComputingGroup/IBEX/issues/7914)
+for details) to pull the latest master branch of the scripts repository and attempt an automatic merge with the local branch.
+This step will immediately fail if the local branch is _not_ named after the machine (e.g. _NDXxxx_) it is being run on.
+Following a successful check of the branch name, an automatic merge is attempted and should this fail, 
+a set of instructions is presented to the user to perform a _manual_ merge.  No further action is taken by this deployment task.
+
+At the time of writing, there is **no** automated task for this 'pull and merge' of the instrument scripts 
+(i.e. is it not present in the CI system), it is **only** performed as an optional step during IBEX deployment.