From 2561b1b2a1c8a2ffe050160bbd0bd04c1c5490e2 Mon Sep 17 00:00:00 2001 From: Martijn Vermaat <m.vermaat.hg@lumc.nl> Date: Mon, 16 Nov 2015 15:46:19 +0100 Subject: [PATCH] Update program --- PREPARATIONS.md | 32 +++++++++++++++++++++++++------- 1 file changed, 25 insertions(+), 7 deletions(-) diff --git a/PREPARATIONS.md b/PREPARATIONS.md index 057a526..1ee0a45 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 -- GitLab