search

UBC-MDS / ds-toolbox

https://toolbox-learn.mds.ubc.ca/
Other
3 stars 6 forks source link

Update module4 #94

Closed flor14 closed 2 years ago

flor14 commented 2 years ago

Changes in module4 before recording the chapter.

netlify[bot] commented 2 years ago

Deploy Preview for cheerful-chebakia-6a18e7 ready!

Name Link
Latest commit 7ebbffa831d50d7c576fb70792ee30cf72dc45b0
Latest deploy log https://app.netlify.com/sites/cheerful-chebakia-6a18e7/deploys/633b1c39aa77d000084064e4
Deploy Preview https://deploy-preview-94--cheerful-chebakia-6a18e7.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 settings.

netlify[bot] commented 2 years ago

Deploy Preview for ds-toolbox ready!

Name Link
Latest commit 7ebbffa831d50d7c576fb70792ee30cf72dc45b0
Latest deploy log https://app.netlify.com/sites/ds-toolbox/deploys/633b1c3964bcad0008d5556c
Deploy Preview https://deploy-preview-94--ds-toolbox.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 settings.

flor14 commented 2 years ago

@joelostblom There are content modifications in this module. The major changes are:

As usual, your comments are welcomed and appreciated if you have time for them.

joelostblom commented 2 years ago

There are major changes in the slides about merge conflicts. Recently, https://github.com/microsoft/vscode/issues/157827#issuecomment-1215052725. So I switch directly to explain how to solve them in the editor and in JupyterLab. Also, I created a special section about Jupyter Notebooks.

I think this new section is great, I didn't know JupyterLab was so good at handling merge conflicts! Could you double check if there are any questions about VS Code merge conflicts in the assignments you made and switch them to JupyterLab to reflect this change?