diff --git a/README.md b/README.md index 36c02a5..36e6fc3 100644 --- a/README.md +++ b/README.md @@ -131,32 +131,16 @@ install-type archetype and prints the Ra build recipe. ## Permissions Members of the `unx-mx_adm` group can update `/opt/psi/MX` directly — no -adm -account needed. Permission problems: tell the admins. +account needed. Permission problems: (1) if you are not in unx-mx_adm group, +ask Meitian/May/Dawn for being added to the group. (2) if you are in the group +for more than 48 hours and still can't write to /opt/psi/MX, ask the SLS +beamline storage and compute admins (Email: sls-htc-admins@lists.psi.ch). ## Tutorial branches (build-*) -Each participant works on their own `build-` branch (e.g. -`build-dials`), all starting from `main`. - -While a branch is still identical to main (fast-forward): - -```bash -git push origin main:build-dials main:build-buster ... -for b in dials buster ...; do git branch -f build-$b main; done -``` - -Once branches have diverged, merge main into each instead: - -```bash -for b in dials buster ...; do - git checkout build-$b && git merge main && git push -done -git checkout main -``` - -If `git push origin main:build-xxx` fails with "non-fast-forward", the branch -has its own commits: use the merge loop, never force-push over other people's -work. +Tutorial branches are all merged to `main`. Thank May (Phenix), Dennis (ccp4), +Emma (CrystFEL), Filipa (Pymol), Milton (Xtrapol8) for building and prepare +the scripts together. ## Resources @@ -164,6 +148,8 @@ work. - modbuild documentation: https://pmodules.github.io/modbuild/ - Environment Modules: https://envmodules.io/ +If you want to provide more, feel free to submit a pull request to this document. + ## Acknowledgements Many thanks to [Achim Gsell](https://www.psi.ch/en/lsm/people/achim-gsell)