Skip to content

GitLab

Commit 46e2da1f authored by Martijn Vermaat's avatar Martijn Vermaat
Browse files

Update program

parent bc1a7079
Hide whitespace changes
Inline Side-by-side
README.md
View file @ 46e2da1f
......@@ -12,7 +12,7 @@ history, etc, GitLab makes your projects more reproducible and collaboration
with colleagues easy ([introduction](http://doc.gitlab.com/ce/gitlab-basics/README.html)).
## Coordinates (preliminary!)
## Coordinates
- Date: April 25th, 2016
- Time: 9:00 - 17:00
......@@ -25,11 +25,11 @@ with colleagues easy ([introduction](http://doc.gitlab.com/ce/gitlab-basics/READ
- Registration: Martijn Vermaat (m.vermaat.hg@lumc.nl)
## Program (preliminary!)
## Program
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.
The contents will be slightly less advanced on the technical side (no branching,
no git-annex) compared to some previous years. Instead, there is more focus on
using the LUMC GitLab server and using Git for data analysis projects.
| Time | Subject | Teacher | Contents |
| ----- | ----------------- | ----------------- | ------------------------- |
......@@ -41,11 +41,11 @@ GitLab server and using Git for data analysis projects.
| 11:15 | [Git and remote repositories](/uploads/fae0409963d991c25221843288ed3368/remotes.pdf) | Martijn Vermaat | Sharing and collaborating via GitLab |
| 12:00 | Lunch | | |
| 13:00 | [Practical](/uploads/bd5d6574d2534d3a7afaf3d43bf70aaf/remotes_handouts.pdf) | | |
| 13:30 | [Combining changes by merging](/uploads/af01008ba3e6f2c0e1742dc292690e22/merging.pdf) | Martijn Vermaat | Commit graph, merging, resolving merge conflicts |
| 14:15 | [Practical](/uploads/b9649d50b3146eaf4632efc80f143f54/merging_handouts.pdf) | | |
| 14:45 | Break | | |
| 15:00 | [Data analysis](usecases/) | Szymon Kiełbasa | More GitLab, Markdown, data analysis use case |
| 16:00 | Questions, drinks | | |
| 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/af01008ba3e6f2c0e1742dc292690e22/merging.pdf) | Martijn Vermaat | Commit graph, merging, resolving merge conflicts |
| 15:30 | [Practical](/uploads/b9649d50b3146eaf4632efc80f143f54/merging_handouts.pdf) | | |
| 16:00 | Questions, closing | | |
## Prerequisites
......
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