diff --git a/README.md b/README.md index 36c02a5..2093c96 100644 --- a/README.md +++ b/README.md @@ -133,31 +133,6 @@ install-type archetype and prints the Ra build recipe. Members of the `unx-mx_adm` group can update `/opt/psi/MX` directly — no -adm account needed. Permission problems: tell the admins. -## 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. - ## Resources - Buildblock examples: https://github.com/Pmodules/buildblocks/tree/master @@ -170,3 +145,14 @@ Many thanks to [Achim Gsell](https://www.psi.ch/en/lsm/people/achim-gsell) for giving the MX group the tutorial on 2026-08-18, and to [Hans Viessmann](https://www.psi.ch/en/awi/people/hans-nikolai-viessmann) and Achim for their support. + +During the tutorial the following people worked on the modules: + +- May — Phenix +- Filipa — Pymol +- Emma — CrystFEL +- Dennis — ccp4 +- Milton — Xtrapol8 + +Thanks to all of them for their participation and contributions to the +scripts. As of 2026-08-19, all build* branches have been merged to main.