Commit fb3a9271 authored by Jeroen F.J. Laros's avatar Jeroen F.J. Laros

Added links to introduction slides and practical.

parent fcdda354
......@@ -30,23 +30,23 @@ This year the contents will be slightly less advanced on the technical side
(no branching, no git-annex). Instead, there is more focus on using the LUMC
GitLab server and using Git for data analysis projects.
| Time | Subject | Teacher | Contents |
| ----- | ----------------- | ----------------- | ------------------------- |
| 09:00 | **Introduction** | Jeroen Laros | Welcome, GitLab overview, SSH keys |
| 09:30 | *Practical* | | |
| 09:45 | [Git basics](http://bit.ly/lumc_git_basics) | Wibowo Arindrarto | Basic Git command line fu |
| 10:30 | *Practical* | | |
| 11:00 | Coffee | | |
| 11:15 | **Git and remote repositories** | Martijn Vermaat | Sharing and collaborating via GitLab |
| 11:45 | *Practical* | | |
| 12:00 | Lunch | | |
| 13:00 | *Practical* | | |
| 13:30 | **Combining changes by merging** | Martijn Vermaat | Resolving merge conflicts, protected branches |
| 14:15 | *Practical* | | |
| 14:45 | Break | | |
| 15:00 | [Data analysis](usecases/) | Szymon M. Kiełbasa | More GitLab, Markdown, data analysis use case |
| 15:30 | *Practical* | | |
| 16:00 | Questions, drinks | | |
| Time | Subject | Teacher | Contents |
| ----- | ----------------- | ----------------- | ------------------------- |
| 09:00 | [Introduction](/uploads/c16e25cadec825ca79a768825f5e64a2/introduction.pdf) | Jeroen Laros | Welcome, GitLab overview, SSH keys |
| 09:30 | [Practical](/uploads/59500f585b0b5f06ce4464375f2104a9/introduction_handouts.pdf) | | |
| 09:45 | [Git basics](http://bit.ly/lumc_git_basics) | Wibowo Arindrarto | Basic Git command line fu |
| 10:30 | *Practical* | | |
| 11:00 | Coffee | | |
| 11:15 | **Git and remote repositories** | Martijn Vermaat | Sharing and collaborating via GitLab |
| 11:45 | *Practical* | | |
| 12:00 | Lunch | | |
| 13:00 | *Practical* | | |
| 13:30 | **Combining changes by merging** | Martijn Vermaat | Resolving merge conflicts, protected branches |
| 14:15 | *Practical* | | |
| 14:45 | Break | | |
| 15:00 | [Data analysis](usecases/) | Szymon Kiełbasa | More GitLab, Markdown, data analysis use case |
| 15:30 | *Practical* | | |
| 16:00 | Questions, drinks | | |
## Prerequisites
......@@ -107,4 +107,4 @@ First clone this repository, then fetch the data from the submodule:
A new presentation can be added like this:
cd presentation
bash mkpres.sh ../mypresentation
bash mkpres.sh ../mypresentation
\ No newline at end of file
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