diff --git a/PREPARATIONS.md b/PREPARATIONS.md index 057a5263b479608ed9c68c6ae9d93ad668236f40..1ee0a4533e6563f0e0a8d51f52daa7941063441f 100644 --- a/PREPARATIONS.md +++ b/PREPARATIONS.md @@ -12,10 +12,28 @@ ## Program -| Time | Subject | Teacher | -| ------ | ------- | ------- | -| 09:00 | Introduction | Jeroen Laros | -| 09:00 | Practical 1 | | -| 09:00 | Git basics | Wibowo Arindrarto | -| 09:00 | Practical 2 | | -| 09:00 | Coffee | | +Very preliminary, please update, extend, or comment. + +| Time | Subject | Teacher | Contents | +| ----- | ----------------- | ----------------- | ------------------------- | +| 09:00 | **Introduction** | Jeroen Laros | Welcome, GitLab overview | +| 09:30 | *Practical* | | | +| 09:45 | **Git basics** | Wibowo Arindrarto | Basic Git command line fu | +| 10:15 | *Practical* | | | +| 10:45 | Coffee | | | +| 11:00 | **Git remotes** | Martijn Vermaat | Collaborating via GitLab | +| 11:30 | *Practical* | | | +| 12:00 | Lunch | | | +| 13:00 | **Git conflicts** | Martijn Vermaat? | Merge conflicts, protected branches | +| 13:30 | *Practical* | | | +| 14:00 | Break | | | +| 14:30 | **Data analysis** | Szymon Kiełbasa | Project template, R-Studio, GitLab | +| 15:00 | *Practical* | | | +| 15:30 | Leftover minutes | | TODO: assign to some lecture or practical | +| 16:00 | Questions, drinks | | | + + +## Comments on the program + +- Branches: not in this course +- Git annex: not in this course