search

pyOpenSci / pyopensci.github.io

This is the website for pyOpenSci. Contributions welcome!!
https://www.pyopensci.org
Other
37 stars 61 forks source link

April 2024 newsletter #345

Closed kierisi closed 6 months ago

kierisi commented 6 months ago

Blog post for the pyOpenSci April 2024 newsletter

lwasser commented 6 months ago

ok this is really weird. it's saying the april 2024 newsletter exists on main. but when i looked at the PR last it was NOT there.

lwasser commented 6 months ago

i suspect this MIGHT be returning a conflict if the file was DELETED rather than the commit removed from the history in the PR that i just merged. that is likely why i can't fix the error in the gui. @kierisi we have two options here

  1. i can pull this down locally and add a commit to re-add the file.
  2. you could sync your fork's main branch.
    • create a new branch off of the newly synced branch
    • re-add this file and any images
    • open a new clean PR.

the second option might be best :) we can also talk more on wednesday or tomorrow if that is helpful. many thanks for pulling this all together!

kierisi commented 6 months ago

i suspect this MIGHT be returning a conflict if the file was DELETED rather than the commit removed from the history in the PR that i just merged. that is likely why i can't fix the error in the gui. @kierisi we have two options here

  1. i can pull this down locally and add a commit to re-add the file.

  2. you could sync your fork's main branch.

    • create a new branch off of the newly synced branch
    • re-add this file and any images
    • open a new clean PR.

the second option might be best :) we can also talk more on wednesday or tomorrow if that is helpful. many thanks for pulling this all together!

just when I think I've figured out git, I learn just how little I know 🙃 I'll give option 2 a try!

kierisi commented 6 months ago

closing pull request due to errors. an updated PR can be found here: https://github.com/pyOpenSci/pyopensci.github.io/pull/351