diff --git a/README.md b/README.md index 4b3184a0b2b0135c2854c883e9bc683f9d036485..b0b345b43cfc676bb00828c4c660d94663ff754a 100644 --- a/README.md +++ b/README.md @@ -15,38 +15,36 @@ with colleagues easy ([introduction](http://doc.gitlab.com/ce/gitlab-basics/READ ## Coordinates In 2017 the course will be given on the following dates: -6 September (10:30 - 17:00), 22 November (9:30 - 16:30). +6 September (10:00 - 17:00), 22 November (9:30 - 16:30). Details for the next session: - Date: September 6th, 2017 -- Time: 10:30 - 17:00 +- Time: 10:00 - 17:00 - Location: 01-J-01-084 - Teachers: - - TBA + - Wibowo Arindrarto + - Jonathan Vis + - Mihai Lefter - Registration via www.medgencentre.nl. Direct access to the [registration form](https://forms.lumc.nl/lumc2/GITcourse). - ## Program -Will be updated shortly. Please find below the program from the last course -session only as a guideline. - | Time | Subject | Teacher | Contents | | ----- | ----------------- | ----------------- | ------------------------- | -| 09:00 | [Introduction](/uploads/8d5bda06500f9aaa7c117aa6f4738667/introduction.pdf) | Jeroen Laros | Welcome, GitLab overview, SSH keys | -| 09:30 | [Practical](/uploads/61571e1506aab941a54a77bb35d4492d/introduction_handouts.pdf) | | | -| 09:45 | [Git basics](http:bit.ly/1WlfXyj) | Wibowo Arindrarto | Basic Git command line fu | -| 10:30 | [Practical](/uploads/eb2e001db4f605a343e19d23d40e754f/basics_handouts.pdf) | | | -| 11:00 | Coffee | | | -| 11:15 | [Git and remote repositories](/uploads/e1239f626e6c32a6c0bd915a0dc716ad/remotes.pdf) | Martijn Vermaat | Sharing and collaborating via GitLab | +| 10:00 | [Introduction](/uploads/8d5bda06500f9aaa7c117aa6f4738667/introduction.pdf) | Mihai Lefter | Welcome, version control introduction | +| 10:30 | [Git basics](http:bit.ly/1WlfXyj) | Wibowo Arindrarto | Basic Git command line flow | +| 11:15 | [Practical](/uploads/eb2e001db4f605a343e19d23d40e754f/basics_handouts.pdf) | | | | 12:00 | Lunch | | | -| 13:00 | [Practical](/uploads/dff8ad1b0f947d5866acdcdc70f3d673/remotes_handouts.pdf) | | | -| 13:30 | [Data analysis](usecases/) | Szymon Kiełbasa | More GitLab, Markdown, data analysis use case | -| 14:30 | Break | | | -| 14:45 | [Combining changes by merging](/uploads/8627b6a3fcdd655217b0ea56f0b93fd0/merging.pdf) | Martijn Vermaat | Commit graph, merging, resolving merge conflicts | -| 15:30 | [Practical](/uploads/9455ef406dfeb0e3c365c015965cd899/merging_handouts.pdf) | | | -| 16:00 | Questions, closing | | | +| 13:00 | [Collaboration: remote repositories](/uploads/e1239f626e6c32a6c0bd915a0dc716ad/remotes.pdf) | Jonathan Vis | Sharing and collaborating via remotes | +| 13:45 | [Practical](/uploads/dff8ad1b0f947d5866acdcdc70f3d673/remotes_handouts.pdf) | | | +| 14:15 | Break | | | +| 14:30 | [Collaboration: combining changes by merging](/uploads/8627b6a3fcdd655217b0ea56f0b93fd0/merging.pdf) | Mihai Lefter | Commit graph, merging, resolving merge conflicts | +| 15:15 | [Practical](/uploads/9455ef406dfeb0e3c365c015965cd899/merging_handouts.pdf) | | | +| 15:45 | Break | | | +| 16:00 | [Extras]() | Mihai Lefter | GitLab, GitHub, Markdown, ... | +| 16:30 | [Practical]() | | | +| 17:00 | Questions, closing | | | ## Prerequisites