UPDATE ......From Tuesday 8 April 2025 we will change the way that Single Sign-on will work on our Confluence (wiki.geant.org) Please see here for more information:
Update
...
| Code Block |
|---|
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
| 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 |
...