Skip to content

Conversation

@benslack19
Copy link
Contributor

Adding lecture 6 to repo.

@review-notebook-app
Copy link

Check out this pull request on  ReviewNB

See visual diffs & provide feedback on Jupyter Notebooks.


Powered by ReviewNB

@benslack19
Copy link
Contributor Author

FYI the conflict is because of the Lecture 4 notebook output. In my original commit, I had forgotten to re-run the whole notebook so that the output of all cells is clean. It's corrected here in this new commit, along with Lecture 6 code.

@benslack19
Copy link
Contributor Author

Hi @canyon289 or @MarcoGorelli, sorry for the bother, but could I please ask one of you to check out or approve this? I'm hoping we can publicize this and recruit contributors before McElreath starts the next iteration of his course which starts in a few weeks.

@canyon289
Copy link
Member

thanks for adding these!

@benslack19
Copy link
Contributor Author

thanks for adding these!

Thank you @canyon289! does someone else need to merge the pull request? For the conflicting file, the new commit is a cleaner notebook for lecture 4, showing all code output.

@canyon289
Copy link
Member

it can't be merged with conflicts. You'll need to rebase or open a new or where the changes are made on top of the current git head

@benslack19
Copy link
Contributor Author

it can't be merged with conflicts. You'll need to rebase or open a new or where the changes are made on top of the current git head

Ah ok, my bad! Thanks for your patience in explaining that to me. I'll correct this.

@canyon289
Copy link
Member

All good. The easiest thing to do is probably create another branch from main, copy these to files on top, and make another PR.

Git and notebooks is miserable so if you try a merge or rebase it may be very painful.

@benslack19 benslack19 closed this Dec 15, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

2 participants