Versions Compared

Old Version 7

changes.mady.by.user Rasmus Thorslund

Saved on

compared with

New Version 8

changes.mady.by.user Maria Haider

Saved on

Key

  • This line was added.
  • This line was removed.
  • Formatting was changed.

...

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)
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 you cherry pick, we did this last time.Instead of a 'full merge' like mentioned above, we did 'cherry pick' on 03.07.2024

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)
git merge multiverse/main (meged the local multiverse branch with upstream multivers's main branch)
git push
git checkout master
git fetch --all
git cherry-pick e315282bc55025c199483fbb5c94d7a053d047f0 4b8b8887f62761759486940b81ea1142af6ae8bb
git add global/overlay/usr/local/bin/sunet-fleetlock
git cherry-pick --continue
Then resolved conflicts by copying the file from multiverse and adding it. to get rid offof <<<<<<< HEAD
<<<<<<< HEAD

...