PLAN.md 4.6 KB
Newer Older
1
2
3
4
5
# Coordinates
- Date: 6th of September 2017
- Time: room is booked between 9:00 - 17:00
- Location: J1-84 

Mihai Lefter's avatar
Mihai Lefter committed
6

7
8
9
10
11
12
# Teachers
- Bowo
- Jeroen
- Jonathan
- Mihai

Mihai Lefter's avatar
Mihai Lefter committed
13

14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
# Audience

| Department                                 | Organization                |
|--------------------------------------------|-----------------------------|
| Human Genetics/ Bio -IT                    | LUMC/GenomeScan             |
| Human Genetics                             | LUMC                        |
| Hematology                                 | LUMC                        |
| Cell biology                               | EMC                         |
| Hematology                                 | LUMC                        |
| Molecular Cell Biology                     | LUMC                        |
| Ouderengeneeskunde                         | LUMC                        |
| Ouderengeneeskunde                         | LUMC                        |
| KNO                                        | LUMC                        |
| molecular genetics                         | EMC                         |
| Radiology                                  | Netherland Cancer Institute |
| Hematopoiesis                              | Sanquin                     |
| Molecular Epidemiology                     | LUMC                        |
| Dermatology                                | LUMC                        |
Mihai Lefter's avatar
Mihai Lefter committed
32
| Directorate Education and Study Programmes | LUMC                        |
33
34
35
36
| ?                                          | Leiden University           |
| ?                                          | Leiden University           |
| Dermatology                                | LUMC                        |

Mihai Lefter's avatar
Mihai Lefter committed
37
38

# Previous course detailed program
Mihai Lefter's avatar
Mihai Lefter committed
39

40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
## Introduction (9:00 - 9:30) - Jeroen
- version control definition
- motivation
- repository types:
  * local
  * distributed
  * centralised
- git history
- GitHub and GitLab as central remotes
- GitLab demonstration
  * logging in
  * landing page
  * profile settings
  * projects

## Practical (9:30 - 9:45)
- local configuration
  * user.name
  * user.email
- remote configuration
  * ssh key generation
  * add ssh key to GitLab

## Git basics (9:45 - 10:30) - Bowo
- local repository init
- clone an existing remote
- hidden git directory
- git operations overview:
  * track files areas
  * file states
- config user.name, user.email, colored output
- git operations flow:
  * status
  * add
  * commit
  * diff
  * log
  * checkout
  * reset
  * revert
- HEAD
- .gitignore

## Practical (10:30 - 11:00)
- create a repository
- create a file inside the repository
- stage the file
- commit the file
- edit the file and stage it again
- check log and see the differences
- create another file and add it to .gitignore

## Break (11:00 - 11:15)

## Git and remote repositories (11:15 - 12:00) - Martijn
- distributed git
- view/add remotes
- transferring commits between repositories:
  * fetch
  * merge
  * pull
  * push (-u)
  * clone
- remote protocols:
  * local
  * HTTPS
  * SSH
  * Git protocol
- GitLab

## Lunch (12:00 - 13:00)

## Practical (13:00 - 13:30)
- create a GitLab project
- add the GitLab project as remote for the local repository created during the previously practical
- push to the GitLab remote
- edit some file on GitLab
- do git fetch and merge
- change file locally and push to GitLab

## Data analysis (13:30 - 14:30) - Szymon
- how GitLab might be used to deliver results to researchers and document their work
- Markdown

## Break (14:30 - 14:45)

Mihai Lefter's avatar
Mihai Lefter committed
126
## Combing changes by merging (14:45 - 15:30) - Martijn
127
128
129
130
131
132
133
- the git commit graph
  * briefly on branches
- inspecting the commit graph
  * annotated log as an alias
- merging from remotes
  * fast forward merge
  * three-way merge
Mihai Lefter's avatar
Mihai Lefter committed
134
- basic merge conflict
135
136
137
138
139
140
141
142
143
  * resolve merge conflicts by hand
  * git mergetool
  * aborting a merge conflict

## Practical (15:30 - 16:00)
- clone a GitLab project from one of the neighbours
- check the commit graph
- do a fast-forward merge
- do a three-way merge
Mihai Lefter's avatar
Mihai Lefter committed
144
145
146
- resolve a merge conflict


Mihai Lefter's avatar
Mihai Lefter committed
147
148
# What to add?
+ git clean
Mihai Lefter's avatar
Mihai Lefter committed
149
+ more on GitHub, GitLab, (Bitbucket?)
Mihai Lefter's avatar
Mihai Lefter committed
150
151
  * pull requests
  * ...
Mihai Lefter's avatar
Mihai Lefter committed
152
153
154
155
156
157
158
159
+ from the current tips and tricks:
  * git blame
  * git diff -w


# What to remove?
- data analysis

Mihai Lefter's avatar
Mihai Lefter committed
160
161
# Next course program

162
## (10:00 - 10:30) Introduction - Mihai
Mihai Lefter's avatar
Mihai Lefter committed
163

164
## (10:30 - 11:15) Git basics - Bowo
Mihai Lefter's avatar
Mihai Lefter committed
165

Mihai Lefter's avatar
Mihai Lefter committed
166
## (11:15 - 12:00) Practical 
Mihai Lefter's avatar
Mihai Lefter committed
167

Mihai Lefter's avatar
Mihai Lefter committed
168
## (12:00 - 13:00) Lunch 
Mihai Lefter's avatar
Mihai Lefter committed
169

170
## (13:00 - 13:45) Collaboration: remotes - Jonathan
Mihai Lefter's avatar
Mihai Lefter committed
171

Mihai Lefter's avatar
Mihai Lefter committed
172
## (13:45 - 14:15) Practical 
Mihai Lefter's avatar
Mihai Lefter committed
173

Mihai Lefter's avatar
Mihai Lefter committed
174
## (14:15 - 14:30) Break
Mihai Lefter's avatar
Mihai Lefter committed
175

176
## (14:30 - 15:15) Collaboration: merging - Mihai
Mihai Lefter's avatar
Mihai Lefter committed
177

Mihai Lefter's avatar
Mihai Lefter committed
178
## (15:15 - 15:45) Practical 
Mihai Lefter's avatar
Mihai Lefter committed
179

Mihai Lefter's avatar
Mihai Lefter committed
180
## (15:45 - 16:00) Break 
Mihai Lefter's avatar
Mihai Lefter committed
181

182
## (16:00 - 16:30) Markdown, GitLab - Mihai
Mihai Lefter's avatar
Mihai Lefter committed
183

184
## (16:30 - 17:00) Practical 
Mihai Lefter's avatar
Mihai Lefter committed
185