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

update plan

parent c06a91cd
No related branches found
No related tags found
No related merge requests found
...@@ -27,11 +27,13 @@ ...@@ -27,11 +27,13 @@
| Hematopoiesis | Sanquin | | Hematopoiesis | Sanquin |
| Molecular Epidemiology | LUMC | | Molecular Epidemiology | LUMC |
| Dermatology | LUMC | | Dermatology | LUMC |
| Directorate Education and Study Programmes | | | Directorate Education and Study Programmes | LUMC |
| ? | Leiden University | | ? | Leiden University |
| ? | Leiden University | | ? | Leiden University |
| Dermatology | LUMC | | Dermatology | LUMC |
# Previous course program
## Introduction (9:00 - 9:30) - Jeroen ## Introduction (9:00 - 9:30) - Jeroen
- version control definition - version control definition
- motivation - motivation
...@@ -75,9 +77,6 @@ ...@@ -75,9 +77,6 @@
- HEAD - HEAD
- .gitignore - .gitignore
Posssible changes:
- introduce already the commit graph and make it more visual for quicker understanding
## Practical (10:30 - 11:00) ## Practical (10:30 - 11:00)
- create a repository - create a repository
- create a file inside the repository - create a file inside the repository
...@@ -121,7 +120,7 @@ Posssible changes: ...@@ -121,7 +120,7 @@ Posssible changes:
## Break (14:30 - 14:45) ## Break (14:30 - 14:45)
## Combing changes by merging (14:45 - 15:30) ## Combing changes by merging (14:45 - 15:30) - Martijn
- the git commit graph - the git commit graph
* briefly on branches * briefly on branches
- inspecting the commit graph - inspecting the commit graph
...@@ -139,4 +138,32 @@ Posssible changes: ...@@ -139,4 +138,32 @@ Posssible changes:
- check the commit graph - check the commit graph
- do a fast-forward merge - do a fast-forward merge
- do a three-way merge - do a three-way merge
- resolve a merge conflict - resolve a merge conflict
\ No newline at end of file
# Next course program
## Introduction (9:00 - 9:30) -
## Practical (9:30 - 9:45)
## Git basics (9:45 - 10:30) -
## Practical (10:30 - 11:00)
## Break (11:00 - 11:15)
## Git and remote repositories (11:15 - 12:00) -
## Lunch (12:00 - 13:00)
## Practical (13:00 - 13:30)
## Data analysis (13:30 - 14:30) -
## Break (14:30 - 14:45)
## Combing changes by merging (14:45 - 15:30) -
## Practical (15:30 - 16:00)
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