We have created two separate branches in https://github.com/SUNET/puppet-sunet:
Reference case: https://jira.sunet.se/browse/SA-72 (when we did for the first time)
git checkout stable-2023v1 git pull git checkout sa-beta git diff HEAD..stable-2023v1 (checked the diffs) git merge stable-2023v1 bump-tag |
Reference case: https://jira.sunet.se/browse/SA-72 (when we did for the first time)
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. |
Once every six months