Commit cc833e67 authored by Mihai's avatar Mihai

Update README.md

parent eecf3d12
......@@ -34,10 +34,10 @@ Details for the next session:
| ----- | ----------------- | ----------------- | ------------------------- |
| 10:00 | [Introduction](/uploads/ccbce60d8d17dd5e9d7949d91cc20a57/introduction.pdf) | Mihai Lefter | Welcome, version control introduction |
| 10:30 | [Git basics](/uploads/5c35a9ecd72033b42ef55b602f6cb548/20170906_-_git-course_-_git-basics.pdf) | Wibowo Arindrarto | Basic Git command line flow |
| 11:15 | [Practical](/uploads/eb2e001db4f605a343e19d23d40e754f/basics_handouts.pdf) | | |
| 11:15 | [Practical](/uploads/d56ee5edaeca415c5430b385750a89de/basics_handouts.pdf) | | |
| 12:00 | Lunch | | |
| 13:00 | [Collaboration: remote repositories](/uploads/e1239f626e6c32a6c0bd915a0dc716ad/remotes.pdf) | Jonathan Vis | Sharing and collaborating via remotes |
| 13:45 | [Practical](/uploads/dff8ad1b0f947d5866acdcdc70f3d673/remotes_handouts.pdf) | | |
| 13:00 | [Collaboration: remote repositories](/uploads/a189f6a373afac0509d96812d7a2b49a/remotes.pdf) | Jonathan Vis | Sharing and collaborating via remotes |
| 13:45 | [Practical](/uploads/286d7abb800c6f3f1540a49a6aefd25b/remotes_handouts.pdf) | | |
| 14:15 | Break | | |
| 14:30 | [Collaboration: combining changes by merging](/uploads/1bc6dc39f8c0234264b3efbbd596ccbe/merging.pdf) | Mihai Lefter | Commit graph, merging, resolving merge conflicts |
| 15:15 | [Practical](/uploads/9455ef406dfeb0e3c365c015965cd899/merging_handouts.pdf) | | |
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment