search

ioos / bio_mobilization_workshop

Marine data mobilization workshop for Biology and Ecosystem Essential Ocean Variables (Bio-Eco EOV) as a Contribution to the UN Decade on Ocean Science for Sustainable Development
https://ioos.github.io/bio_mobilization_workshop/
Other
5 stars 9 forks source link

update links and basisOfRecord vocabularies #42

Closed ymgan closed 1 year ago

ymgan commented 1 year ago

Sorry @MathewBiddle I did not notice that there were two repositories, so here you go, the PR requested for #41

MathewBiddle commented 1 year ago

interesting. It looks like you merged in changes from another PR, made your changes, and submitted this. Let me see how we can disentangle this.

ymgan commented 1 year ago

Sorry, I am not great with PR 🙈 just trying to help

7yl4r commented 1 year ago

I think what happened is that this PR forked off of another branch. The easiest solution is to create a new branch off of ioos:gh-pages latest, then cherry pick 339f91af840c446d45de27d3156fb49b72233557 over to your new branch and submit a new PR.

albenson-usgs commented 1 year ago

@ymgan if it would be easier to send me the changes via email I can review them and put them into the main branch. Whatever is easiest for you!

ymgan commented 1 year ago

I am sorry, I am really busy 🙈 can you please have a look if the changes in this commit https://github.com/ioos/bio_mobilization_workshop/pull/42/commits/339f91af840c446d45de27d3156fb49b72233557 works for you? These are the only changes from me.

I am not sure myself if the links that I replaced are the correct ones (see https://github.com/ioos/bio_mobilization_workshop/issues/41) because the current links are outdated and redirected (so I could not see the original page). @MathewBiddle suggested me to submit a PR so that he knows what I was talking about. Hope that works for you, thanks a lot!

MathewBiddle commented 1 year ago

Cherry picked the schema page and submitted a new PR https://github.com/ioos/bio_mobilization_workshop/pull/43

Sorry this was so troublesome. I was hoping we could figure out a way to cherry pick your PR, that way you get credit for your contributions here. Luckily you have submitted a PR that has been successfully merged, previously, making you a contributor to this project.

Closing this PR now.