search

neuromatch / climate-course-content

Computational Climate Science syllabus
BSD 3-Clause "New" or "Revised" License
7 stars 16 forks source link

W2D1 curriculum specialist & day lead updates #31

Closed BrodiePearson closed 2 months ago

BrodiePearson commented 3 months ago

This PR replaces last year's W2D1 tutorials with this years updated set of 4 tutorials.

Checked with Python 3.9 locally

BrodiePearson commented 2 months ago

@iamzoltan I have updated the PR to fix almost all the issues you mentioned. I won't be able to address any other significant changes until next week.

The only remaining issue is the merge conflict on the Tutorial 2 file. I am unable to see what the actual conflict is, and Github won't let me resolve the conflict in the web editor. I don't think I will be able to address this conflict, but essentially the new file needs to replace the old file (it is a completely different tutorial from the previous Tutorial 2 - so I don't understand why it is flagging a conflict rather than noticing this is a complete replacement)

iamzoltan commented 2 months ago

This is because the code base has deviated since you started to work on it, and you didnt not update your fork to the updated code base before making your PR. The best way to resolve the merge conflict, is for you to update your fork with the upstream repo, and grab the release branch, then rebase your new branch onto the release branch and push your branch to your fork.