Skip to content
Snippets Groups Projects
Commit b22f5e7a authored by Mihai Lefter's avatar Mihai Lefter
Browse files

Update README.md

parent d2221286
No related branches found
No related tags found
No related merge requests found
...@@ -39,7 +39,7 @@ Details for the next session: ...@@ -39,7 +39,7 @@ Details for the next session:
| 13:00 | [Collaboration: remote repositories](/uploads/e1239f626e6c32a6c0bd915a0dc716ad/remotes.pdf) | Jonathan Vis | Sharing and collaborating via remotes | | 13:00 | [Collaboration: remote repositories](/uploads/e1239f626e6c32a6c0bd915a0dc716ad/remotes.pdf) | Jonathan Vis | Sharing and collaborating via remotes |
| 13:45 | [Practical](/uploads/dff8ad1b0f947d5866acdcdc70f3d673/remotes_handouts.pdf) | | | | 13:45 | [Practical](/uploads/dff8ad1b0f947d5866acdcdc70f3d673/remotes_handouts.pdf) | | |
| 14:15 | Break | | | | 14:15 | Break | | |
| 14:30 | [Collaboration: combining changes by merging](/uploads/8627b6a3fcdd655217b0ea56f0b93fd0/merging.pdf) | Mihai Lefter | Commit graph, merging, resolving merge conflicts | | 14:30 | [Collaboration: combining changes by merging](/uploads/1bc6dc39f8c0234264b3efbbd596ccbe/merging.pdf) | Mihai Lefter | Commit graph, merging, resolving merge conflicts |
| 15:15 | [Practical](/uploads/9455ef406dfeb0e3c365c015965cd899/merging_handouts.pdf) | | | | 15:15 | [Practical](/uploads/9455ef406dfeb0e3c365c015965cd899/merging_handouts.pdf) | | |
| 15:45 | Break | | | | 15:45 | Break | | |
| 16:00 | [Extras]() | Mihai Lefter | GitLab, GitHub, Markdown, ... | | 16:00 | [Extras]() | Mihai Lefter | GitLab, GitHub, Markdown, ... |
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment