Commit 3a4b04c3 authored by Martijn Vermaat's avatar Martijn Vermaat

Update merging slides

parent 0042db71
...@@ -40,7 +40,7 @@ GitLab server and using Git for data analysis projects. ...@@ -40,7 +40,7 @@ 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 | | 11:15 | [Git and remote repositories](/uploads/fae0409963d991c25221843288ed3368/remotes.pdf) | Martijn Vermaat | Sharing and collaborating via GitLab |
| 12:00 | Lunch | | | | 12:00 | Lunch | | |
| 13:00 | [Practical](/uploads/bd5d6574d2534d3a7afaf3d43bf70aaf/remotes_handouts.pdf) | | | | 13:00 | [Practical](/uploads/bd5d6574d2534d3a7afaf3d43bf70aaf/remotes_handouts.pdf) | | |
| 13:30 | [Combining changes by merging](/uploads/89a6d236332f607b1c091448836efc87/merging.pdf) | Martijn Vermaat | Commit graph, merging, resolving merge conflicts | | 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:15 | [Practical](/uploads/b9649d50b3146eaf4632efc80f143f54/merging_handouts.pdf) | | |
| 14:45 | Break | | | | 14:45 | Break | | |
| 15:00 | [Data analysis](usecases/) | Szymon Kiełbasa | More GitLab, Markdown, data analysis use case | | 15:00 | [Data analysis](usecases/) | Szymon Kiełbasa | More GitLab, Markdown, data analysis use case |
...@@ -105,4 +105,4 @@ First clone this repository, then fetch the data from the submodule: ...@@ -105,4 +105,4 @@ First clone this repository, then fetch the data from the submodule:
A new presentation can be added like this: A new presentation can be added like this:
cd presentation 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