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 checkout stable-2023v1 git pull git checkout sa-beta git diff HEAD..stable-2023v1 (checked the diffs) git merge stable-2023v1 git status (check if there are conflicts) git diff stable-2023v1:<file> HEAD:<file> (to check file with conflicts) fix conflicts locally or run git merge abort && git merge stable-2023v1 -X theirs (to replace the conflicted files with those from stable-2023v1) ./bump-tag |
Multiverse 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 there ar no conflicts
- create a Pull Request in Github
- double check the commits going in the merge
- confirm the merge
- run bump-tag from CLI
If there are conflicts, do not open a PR, use CLI to fix the conflicts by below manner
| Code Block |
|---|
git checkout master git pull Fix conflicts locally or run git merge -X theirs multiverse (to replace the conflicted files with those from 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
...