Merge pull request #71 from LDSSA/SLU05-git-intermediate

Slu05 git intermediate
LDSSA · Apr 18, 2021 · 260651e · 260651e
2 parents e420860 + 834b4bf
commit 260651e
Show file tree

Hide file tree

Showing 43 changed files with 1,909 additions and 0 deletions.
diff --git a/Week 03/SLU05 - Git Intermediate/Exercise notebook.ipynb b/Week 03/SLU05 - Git Intermediate/Exercise notebook.ipynb
diff --git a/Week 03/SLU05 - Git Intermediate/Learning notebook.ipynb b/Week 03/SLU05 - Git Intermediate/Learning notebook.ipynb
diff --git a/Week 03/SLU05 - Git Intermediate/README.md b/Week 03/SLU05 - Git Intermediate/README.md
@@ -0,0 +1,43 @@
+# Small Learning Unit 05 - Git Intermediate
+
+## What is in this SLU?
+
+**Git is love, Git is live!**
+
+This will be your motto while learning the inner details of GitHub and other version control software. If none of these words make sense to you, do not worry. The power of versioning will be passed on to you, slowly and painlessly.
+
+You'll learn why a good comprehension of version control software is an absolutely necessary skill to dominate, understand how it works and how it can help you in your software development journey, and get familiar with some of the most common commands.
+
+#### Main topics
+
+- Working with Git - a review
+- The remote repository
+- Cloning a repository
+- Stash changes
+- Git branches
+  - Concept of main/master branch
+  - Creating and switching branches
+  - A final note on creating branches
+  - Merging branches
+  - Merge conflicts
+  - Solving a merge conflict
+  - A note about jupyter notebooks conflicts
+- Collaboration
+  - Create an issue
+  - Fork a repository
+  - Create a pull request
+  - The github flow
+
+## How to go through this SLU
+
+1. Follow the [Learning Unit Workflow](https://github.com/LDSSA/ds-prep-course-2021#2-learning-unit-workflow) to setup your environment.
+2. Go through the Learning Notebook.
+3. Do the Exercise notebook, and submit it, as usual.
+
+## "I need help understanding something"
+
+You can and should ask for help, be it about Learning Notebooks, Exercises, or anything else. Please checkout the [How to Ask for Help](https://github.com/LDSSA/ds-prep-course-2021#4-how-to-ask-for-help), and remember not to share code when asking for help about the exercises!
+
+## Additional notes
+
+Don't forget to install the requirements using the requirements.txt file for this SLU!
diff --git a/Week 03/SLU05 - Git Intermediate/assets/01_git_remote.png b/Week 03/SLU05 - Git Intermediate/assets/01_git_remote.png
diff --git a/Week 03/SLU05 - Git Intermediate/assets/02_git_remote_v.png b/Week 03/SLU05 - Git Intermediate/assets/02_git_remote_v.png
diff --git a/Week 03/SLU05 - Git Intermediate/assets/03_git_status_after_creating_remote.png b/Week 03/SLU05 - Git Intermediate/assets/03_git_status_after_creating_remote.png
diff --git a/Week 03/SLU05 - Git Intermediate/assets/04_code_groceries.png b/Week 03/SLU05 - Git Intermediate/assets/04_code_groceries.png
diff --git a/Week 03/SLU05 - Git Intermediate/assets/05_groceries_list_original.png b/Week 03/SLU05 - Git Intermediate/assets/05_groceries_list_original.png
diff --git a/Week 03/SLU05 - Git Intermediate/assets/06_stage_and_commit_groceries.png b/Week 03/SLU05 - Git Intermediate/assets/06_stage_and_commit_groceries.png
diff --git a/Week 03/SLU05 - Git Intermediate/assets/07_git_log_after_commit.png b/Week 03/SLU05 - Git Intermediate/assets/07_git_log_after_commit.png
diff --git a/Week 03/SLU05 - Git Intermediate/assets/08_git_push.png b/Week 03/SLU05 - Git Intermediate/assets/08_git_push.png
diff --git a/Week 03/SLU05 - Git Intermediate/assets/09_git_status.png b/Week 03/SLU05 - Git Intermediate/assets/09_git_status.png
diff --git a/Week 03/SLU05 - Git Intermediate/assets/10_git_log.png b/Week 03/SLU05 - Git Intermediate/assets/10_git_log.png
diff --git a/Week 03/SLU05 - Git Intermediate/assets/11_github_groceries.png b/Week 03/SLU05 - Git Intermediate/assets/11_github_groceries.png
diff --git a/Week 03/SLU05 - Git Intermediate/assets/12_github_edit_groceries_and_commit.png b/Week 03/SLU05 - Git Intermediate/assets/12_github_edit_groceries_and_commit.png
diff --git a/Week 03/SLU05 - Git Intermediate/assets/13_git_remote_show_origin.png b/Week 03/SLU05 - Git Intermediate/assets/13_git_remote_show_origin.png
diff --git a/Week 03/SLU05 - Git Intermediate/assets/14_git_pull.png b/Week 03/SLU05 - Git Intermediate/assets/14_git_pull.png
diff --git a/Week 03/SLU05 - Git Intermediate/assets/15_git_log_three_commits.png b/Week 03/SLU05 - Git Intermediate/assets/15_git_log_three_commits.png
diff --git a/Week 03/SLU05 - Git Intermediate/assets/16_git_status_before_stash.png b/Week 03/SLU05 - Git Intermediate/assets/16_git_status_before_stash.png
diff --git a/Week 03/SLU05 - Git Intermediate/assets/17_git_stash_and_git_status.png b/Week 03/SLU05 - Git Intermediate/assets/17_git_stash_and_git_status.png
diff --git a/Week 03/SLU05 - Git Intermediate/assets/18_push_to_master.jpeg b/Week 03/SLU05 - Git Intermediate/assets/18_push_to_master.jpeg
diff --git a/Week 03/SLU05 - Git Intermediate/assets/19_git_create_branch.png b/Week 03/SLU05 - Git Intermediate/assets/19_git_create_branch.png
diff --git a/Week 03/SLU05 - Git Intermediate/assets/20_git_checkout_feature_a.png b/Week 03/SLU05 - Git Intermediate/assets/20_git_checkout_feature_a.png
diff --git a/Week 03/SLU05 - Git Intermediate/assets/21_commit_feature_a.png b/Week 03/SLU05 - Git Intermediate/assets/21_commit_feature_a.png
diff --git a/Week 03/SLU05 - Git Intermediate/assets/22_checkout_feature_b.png b/Week 03/SLU05 - Git Intermediate/assets/22_checkout_feature_b.png
diff --git a/Week 03/SLU05 - Git Intermediate/assets/23_create_and_commit_foods.png b/Week 03/SLU05 - Git Intermediate/assets/23_create_and_commit_foods.png
diff --git a/Week 03/SLU05 - Git Intermediate/assets/24_git_log_branches.png b/Week 03/SLU05 - Git Intermediate/assets/24_git_log_branches.png
diff --git a/Week 03/SLU05 - Git Intermediate/assets/25_graph_decorate.png b/Week 03/SLU05 - Git Intermediate/assets/25_graph_decorate.png
diff --git a/Week 03/SLU05 - Git Intermediate/assets/26_list_files_in_branches.png b/Week 03/SLU05 - Git Intermediate/assets/26_list_files_in_branches.png
diff --git a/Week 03/SLU05 - Git Intermediate/assets/27_git_push_new_branch.png b/Week 03/SLU05 - Git Intermediate/assets/27_git_push_new_branch.png
diff --git a/Week 03/SLU05 - Git Intermediate/assets/28_github_branches.png b/Week 03/SLU05 - Git Intermediate/assets/28_github_branches.png
diff --git a/Week 03/SLU05 - Git Intermediate/assets/29_git_merge_battle.gif b/Week 03/SLU05 - Git Intermediate/assets/29_git_merge_battle.gif
diff --git a/Week 03/SLU05 - Git Intermediate/assets/30_diagram_just_master.png b/Week 03/SLU05 - Git Intermediate/assets/30_diagram_just_master.png
diff --git a/Week 03/SLU05 - Git Intermediate/assets/31_diagram_merge_feature_a.png b/Week 03/SLU05 - Git Intermediate/assets/31_diagram_merge_feature_a.png
diff --git a/Week 03/SLU05 - Git Intermediate/assets/31_diagram_two_branches.png b/Week 03/SLU05 - Git Intermediate/assets/31_diagram_two_branches.png
diff --git a/Week 03/SLU05 - Git Intermediate/assets/32_diagram_before_3_way_merge.png b/Week 03/SLU05 - Git Intermediate/assets/32_diagram_before_3_way_merge.png
diff --git a/Week 03/SLU05 - Git Intermediate/assets/33_diagram_merges_complete.png b/Week 03/SLU05 - Git Intermediate/assets/33_diagram_merges_complete.png
diff --git a/Week 03/SLU05 - Git Intermediate/assets/34_merge_conflict_is_comming.jpeg b/Week 03/SLU05 - Git Intermediate/assets/34_merge_conflict_is_comming.jpeg
diff --git a/Week 03/SLU05 - Git Intermediate/assets/35_git_merge_no_conflicts.jpeg b/Week 03/SLU05 - Git Intermediate/assets/35_git_merge_no_conflicts.jpeg
diff --git a/Week 03/SLU05 - Git Intermediate/assets/99_come_on.gif b/Week 03/SLU05 - Git Intermediate/assets/99_come_on.gif
diff --git a/Week 03/SLU05 - Git Intermediate/assets/branches_diagram.drawio b/Week 03/SLU05 - Git Intermediate/assets/branches_diagram.drawio
@@ -0,0 +1 @@
+<mxfile host="app.diagrams.net" modified="2020-05-16T18:16:50.354Z" agent="5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/81.0.4044.138 Safari/537.36" etag="wjHQMqzRpn8hB6UFT5YM" version="13.0.1" type="device"><diagram name="Page-1" id="42789a77-a242-8287-6e28-9cd8cfd52e62">7V1dj5s4FP010T61AvwBPM5MO9uVttJK87DtU+UEJ6ElOEucmaS/fk1iCARmxm0C10yilbrxBQzj63Pse88NGaG7xebPjC3nn0XEk5HnRJsR+jDyvCAI1b+5Ybs3YOzsDbMsjvamiuEh/sn3RrewruOIr7Rtb5JCJDJe1o0TkaZ8Ims2lmXiqX7aVCRRzbBkM94wPExY0rT+G0dyrq2u4xwOfOLxbK5vHRB9YMwmP2aZWKf6fiMP3Xv5f/vDC1b0pc9fzVkkniom9HGE7jIh5P7TYnPHk3xo68N2/8zR8rkznkqTCzL+lxOGconv56tkO6Y/P92Sdy7SDye3xYDwSI2PbopMzsVMpCz5eLDeTtbZI897dVVjNwK7lqNahwv+FmKpT/nOpdxqz7O1FMo0l4tEH+WbWH6pfP6ad/We6NaHje5519jqxkpm4kfpLzWUt1ORyuKpdz2l0U0+O1QzFSnfW+7jJNE97P/s/G99dji1aSXW2YS/NIZYT1uWzbh86URaul2hiYsFl9lWXZjxhMn4sf4kTM/rWXnewbfqg3bvr7haP+YjS9a8mLI0kflwLlmqPs/kbmCqtsrEoP+t86m6G+l3q503b9QJrvueUuovN4cziq4wG3s+84se1VO33ahhPp6PSaK4IPfg0zyW/GHJdt54UmxUn0hstdwTxDTe5BPy1VmyHw6eSb55eRI0XaYvKLhOc1+gm08HIqHaNK9QSGE7v4vJINGsBjvbfqk2KlflzcNlu5adLEBNWcAHZQHaNwv4eOyHIX3DLOA5ltGA37ePiTd1pi6z1seqrUB/JxKR7W6FIsKDCJdXVo4E3hhRWj7eSRMDUcsmRtAyMYAXDCN4noehw2EwdNhw0oKtJM8arqqP/SuYOR0QTU+dAyKkDhE3cBsYCVow4oUdDX8Zrg1tD/XyTqc/mJVR/Gsw8xAkzIqOr+FQZ+EQdoHXOwuWtz7jIYs4AJlyAAblANQ3B1xeMAROAshtjl/fJGAPME1zlR7oHhgNlbiH5+cAlIB7z0lDZyrOEXadm7KP0xTglO2RlmlxMXkKzzSTDLx5amaSLyhPQVow0panQJ1hxCzJO3Z9RXjBW9hZEq/ugtIlYDTVlk5tumAaOoQ4HMIFS57F6m/lWd5LnM40BLv2DPah9/wWJPHKIP4Qt38dVcP23xM1z7jOmObDYWMBr5kPb0UZZ3Kd8W/s21iIHytTtJ1zbeKuWp38trUppD5ina1NOCQ1+HlhE36u2+fihLC1+HNfwV8lhpskbLWKJ7Uwrt+tIDLOo4GGccgsj1ZAdPxtKkRUQnSc/Wr4dU7QTqecTiZtoI38cOy0U3IHoCUUHLRDrR6yJemCTAM3BIvW3kuALk75CqAzKMgfKJaHrnyhwJAD8DMTqicOMAtdr8rXKWWA4CQQwpOANcDEpmUpGDSrii3IXAx6E2buZwLq597Lj6CVr/51LHACxl6Lk4HR/Xqp9DnBaJq/OJl09aX/iFg9Y2VbflyAfeTq/YPpq468XT7GCROgmRh5wxoZRfXR9ilp4K9XjQyblRdYo5EBfU3hWL7xoYU13Kb/X4U1hR5oYQ1T8AXMfmEN+32teqf50qyC4CqslfCj4MIaDqzF36CENWyqfQNHiU3tuyGidYg7W7SxEFwbI/CB27DTMsQ0EiSggCO9fyPk4rQx14XexBILqlMuUhwjxJQEQAVyYhZ+XsWxE8QxC1jAhlDWGmSaytYUVLYmQy1rGJ6fPVA/916ecHnqmAUM3FbZDQzvXuWxYmS7Z10zecx1j33dsT5W3O4y9LHyO2PFcDstQkuvAhk1q0K4CmTHOIGuLKCekeMuTyFzS7CAucaCMvq3kKKnptX0sFtV2qymv8QUvYs86Bw9beqZn/Vmwpmru3lOHnvlbxJfLOJ8FyTnLP9fQ+B0IsFX6R9yd91jfglLo9zMI172xVp6KvYujQ6OJoAadtm27Sy8p4PEqqu1iSXxLM3hqdyk7oRucyfGE5bc6AOLOIqS5xi8PvHOwb64NgnC4gWTlTnQSr5BZ3PAAn100AkCaiqM+qCJINoWOl51mrPqNMRpornXnVSRnxgcmIeu0/imNfQ+aAGTbxa9XnWaU3QaeBaATwpahEzT97r5oO/s8If5szJD9DOoUu5f3Pv7AHQaeAYe4Ov4fr9O/JwoNk1hBT3pOzgM6n10rO/4F/WOQHocQeGWXHSv+k4AD9Qu1mHV0vdz27ngnBg2/TLHyRg+jaMH9jrIbnQ5jIGXyuBaWgoGVNPSJmCgXl8a+gx4CYXe59rwvpQ3oNwWWxzLg9fiMS9duaWkibt+ldviN7+e5cSTUgau2vFgim3Y84BUL9Hjn1jrMKGgmodftN5HkYdfDUcf/wc=</diagram></mxfile>
diff --git a/Week 03/SLU05 - Git Intermediate/requirements.txt b/Week 03/SLU05 - Git Intermediate/requirements.txt
@@ -0,0 +1,71 @@
+alembic==1.5.8
+argon2-cffi==20.1.0
+async-generator==1.10
+attrs==20.3.0
+backcall==0.2.0
+bleach==3.3.0
+certifi==2020.12.5
+cffi==1.14.5
+chardet==4.0.0
+click==7.1.2
+decorator==4.4.2
+defusedxml==0.7.1
+entrypoints==0.3
+fuzzywuzzy==0.18.0
+greenlet==1.0.0
+idna==2.10
+importlib-metadata==3.9.0
+ipykernel==5.5.0
+ipython==7.22.0
+ipython-genutils==0.2.0
+ipywidgets==7.6.3
+jedi==0.18.0
+Jinja2==2.11.3
+jsonschema==3.2.0
+jupyter==1.0.0
+jupyter-client==6.1.12
+jupyter-console==6.4.0
+jupyter-core==4.7.1
+jupyterlab-pygments==0.1.2
+jupyterlab-widgets==1.0.0
+ldsagrader==0.1.15
+Mako==1.1.4
+MarkupSafe==1.1.1
+mistune==0.8.4
+nbclient==0.5.3
+nbconvert==6.0.7
+nbformat==5.1.2
+nbgrader==0.6.1
+nest-asyncio==1.5.1
+notebook==6.3.0
+packaging==20.9
+pandocfilters==1.4.3
+parso==0.8.1
+pexpect==4.8.0
+pickleshare==0.7.5
+prometheus-client==0.9.0
+prompt-toolkit==3.0.18
+ptyprocess==0.7.0
+pycparser==2.20
+Pygments==2.8.1
+pyparsing==2.4.7
+pyrsistent==0.17.3
+python-dateutil==2.8.1
+python-editor==1.0.4
+pyzmq==22.0.3
+qtconsole==5.0.3
+QtPy==1.9.0
+requests==2.25.1
+Send2Trash==1.5.0
+six==1.15.0
+SQLAlchemy==1.4.3
+terminado==0.9.3
+testpath==0.4.4
+tornado==6.1
+traitlets==5.0.5
+typing-extensions==3.7.4.3
+urllib3==1.26.4
+wcwidth==0.2.5
+webencodings==0.5.1
+widgetsnbextension==3.5.1
+zipp==3.4.1
diff --git a/Week 03/SLU05 - Git Intermediate/submit.py b/Week 03/SLU05 - Git Intermediate/submit.py
@@ -0,0 +1,22 @@
+import requests
+import json
+
+
+def submit(slack_id: str, learning_unit: int) -> None:
+    '''
+    Submits the notebook to the grades-collector.
+
+    param slack_id like "UTS63FC02"
+    param learning_unit like 0
+    '''
+    data = {
+        "learning_unit": learning_unit,
+        "slack_id": slack_id,
+        "grade": 0,
+        "metadata": {}
+    }
+    response = requests.put(
+        "https://sub-nb-grades-collector.herokuapp.com/submit",
+        data=json.dumps(data)
+    )
+    print('Success' if response.ok else 'Whoopsie Daisy')
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		<mxfile host="app.diagrams.net" modified="2020-05-16T18:16:50.354Z" agent="5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/81.0.4044.138 Safari/537.36" etag="wjHQMqzRpn8hB6UFT5YM" version="13.0.1" type="device"><diagram name="Page-1" id="42789a77-a242-8287-6e28-9cd8cfd52e62">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</diagram></mxfile>