Commit be883511 authored by Mihai's avatar Mihai

update plan with what to add

parent dbe48e84
......@@ -3,12 +3,14 @@
- Time: room is booked between 9:00 - 17:00
- Location: J1-84
# Teachers
- Bowo
- Jeroen
- Jonathan
- Mihai
# Audience
| Department | Organization |
......@@ -32,7 +34,8 @@
| ? | Leiden University |
| Dermatology | LUMC |
# Previous course program
# Previous course detailed program
## Introduction (9:00 - 9:30) - Jeroen
- version control definition
......@@ -128,7 +131,7 @@
- merging from remotes
* fast forward merge
* three-way merge
- basic merge conflicts
- basic merge conflict
* resolve merge conflicts by hand
* git mergetool
* aborting a merge conflict
......@@ -141,29 +144,46 @@
- resolve a merge conflict
# What to add?
+ git clean
+ git stash
+ pull requests
+ more on GitHub vs GitLab (vs BitBucket)
+ from the current tips and tricks:
* git blame
* git tag
* git diff -w
* ammend
* modifying global ignore
* commands aliases
# What to remove?
- data analysis
# Next course program
## Introduction (9:00 - 9:30) -
## (10:00 - 10:30) Introduction -
## Practical (9:30 - 9:45)
## (10:30 - 11:15) Git basics -
## Git basics (9:45 - 10:30) -
## (11:15 - 12:00) Practical
## Practical (10:30 - 11:00)
## (12:00 - 13:00) Lunch
## Break (11:00 - 11:15)
## (13:00 - 13:45) Collaboration: remotes -
## Git and remote repositories (11:15 - 12:00) -
## (13:45 - 14:15) Practical
## Lunch (12:00 - 13:00)
## (14:15 - 14:30) Break
## Practical (13:00 - 13:30)
## (14:30 - 15:15) Collaboration: merging -
## Data analysis (13:30 - 14:30) -
## (15:15 - 15:45) Practical
## Break (14:30 - 14:45)
## (15:45 - 16:00) Break
## Combing changes by merging (14:45 - 15:30) -
## (16:00 - 16:30) Tips? -
## Practical (15:30 - 16:00)
## (15:30 - 16:00) 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