UPDATE ......From Tuesday 8 April 2025 we have changed the way that Single Sign-on works on this wiki. Please see here for more information:
Update
...
Code Block |
---|
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, but in next update, we will create a new one)
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.
If there are conflicts, do not open a PR, use CLI to fix the conflicts. Double check the commits going in the merge.
./bump-tag |
Exceptions
01.07.2024
We have an accidental merge commit in PR performed on 01.07.2024. This is 43b07e2e6d286b7f1f61ab1603a732fd8e94eeda. We accidentaly merged master in multiverse and that commit was added with the PR into master. The PR was signed by a key that was not part of the thiss-ops. We fixed it in below manner.
...