Commit 2561b1b2 authored by Martijn Vermaat's avatar Martijn Vermaat

Update program

parent b1a7df18
......@@ -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
  • I'm good with the lecture assignment for my part. I suppose the cookiecutter part will be hinted in the intro lecture and explained more in the data analysis lecture?

    For the basics part, I was thinking of:

    1. adding more warnings / reminders not to commit large data files
    2. adding a very basic configuration (just the name and email)
    3. adding a small note on git show

    Does that sound sensible?

    Edited by bow
  • I think the cookiecutter part (and also the project skeleton) will have to be discussed with Szymon since he is now assigned to that lecture.

    1. 👍 on warning about large files, I can perhaps hint at git annex and git LFS at the end of the Remotes lecture? Or perhaps we can combine Questions with a few general hints (e.g., one of us asks the question if no-one else does ;) )?
    2. git show would be good to cover, yes.
    3. Yes, unless this is already covered in the introduction practical.
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