Skip to content

update to life science cluster name#42

Merged
graeme-a-stewart merged 2 commits intomainfrom
EOSCLifeUpdate
Jul 11, 2024
Merged

update to life science cluster name#42
graeme-a-stewart merged 2 commits intomainfrom
EOSCLifeUpdate

Conversation

@SanjeAntona
Copy link
Copy Markdown
Collaborator

EOSC Life changed their name to "Life Science RI" (RI for research infrastructure) and have a new webpage
Changed accordingly for everse webpage

@netlify
Copy link
Copy Markdown

netlify Bot commented Jul 10, 2024

Deploy Preview for creative-pothos-781f99 ready!

Name Link
🔨 Latest commit 7938b0b
🔍 Latest deploy log https://app.netlify.com/sites/creative-pothos-781f99/deploys/668fd1937c05b000070acd40
😎 Deploy Preview https://deploy-preview-42--creative-pothos-781f99.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

@netlify
Copy link
Copy Markdown

netlify Bot commented Jul 10, 2024

Deploy Preview for lucky-basbousa-c4d412 ready!

Name Link
🔨 Latest commit 7938b0b
🔍 Latest deploy log https://app.netlify.com/sites/lucky-basbousa-c4d412/deploys/668fd1932518470008f17842
😎 Deploy Preview https://deploy-preview-42--lucky-basbousa-c4d412.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

Copy link
Copy Markdown
Collaborator

@graeme-a-stewart graeme-a-stewart left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@graeme-a-stewart
Copy link
Copy Markdown
Collaborator

There's a small problem with the PR - you started it from your main branch which hadn't been updated with the ENVRI-FAIR -> ENVRI change. As these are right next to each other in the file, git thinks there is a conflict.

You could try this:

git fetch --all # Get all upstream updates
git checkout EOSCLifeUpdate # Just in case you are not there
git rebase origin/main # Redo the change on top of where main is right now
git push -f # Force this change back to Github

You might have to edit the _index.md file to resolve the "conflict" and then also do a git add _index.md.

It's quite a far for a one line change!

Lesson: always start updates from the current state of the deployed main branch!

@graeme-a-stewart graeme-a-stewart merged commit 64163d9 into main Jul 11, 2024
@iraszl iraszl mentioned this pull request Nov 9, 2025
@kennethrioja kennethrioja deleted the EOSCLifeUpdate branch March 5, 2026 16:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants