Page History

...

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

...

Stop cosmos on affected servers and after bump-tag, run cosmos as test in few servers with redudnancy, then reboot and check that the service is working, there's no error in cosmos logs and no alarms in nagios.

git remote add multiverse git@github.com:SUNET/multiverse.git
git fetch --all
git checkout -b multiverse-<year>-<month>-<day>
git merge multiverse/main
git checkout master
git pull
git diff HEAD.. multiverse-<year>-<month>-<day>
git merge -X theirs  multiverse-<year>-<month>-<day>
git status
(Fix the conflicts, add and commit)
./bump-tag

OLD Method

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

git checkout master
git pull
Fix conflicts locally or run git merge -X theirs multiverse (to replace the conflicted files with those from multiverse)
./bump-tag
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. 

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.

...