git checkout stable-2023v1
git pull
git checkout sa-beta
git diff HEAD..stable-2023v1 (checked the diffs)
git merge stable-2023v1
bump-tag

git remote add multiverse git@github.com:SUNET/multiverse.git (If you don't already have it in your .git/config)
git fetch --all
git checkout multiverse (we already have a multiverse branch in remote)
git merge multiverse/main (meged the local multiverse branch with upstream multivers's main branch)
git push
Now we can check the diffs here https://github.com/TheIdentitySelector/thiss-ops/compare/master...multiverse
If satisified, create a Pull Request and confirm the merge.

git remote add multiverse git@github.com:SUNET/multiverse.git (If you don't already have it in your .git/config)
git fetch --all
git checkout multiverse (we already have a multiverse branch in remote)
git merge multiverse/main (meged the local multiverse branch with upstream multivers's main branch)
git push
git checkout master
git fetch --all
git cherry-pick e315282bc55025c199483fbb5c94d7a053d047f0 4b8b8887f62761759486940b81ea1142af6ae8bb
git add global/overlay/usr/local/bin/sunet-fleetlock
git cherry-pick --continue
Then resolved conflicts by copying the file from multiverse and adding it. to get rid off <<<<<<< HEAD
<<<<<<< HEAD