Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Git course
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
courses
Git course
Commits
dbe48e84
Commit
dbe48e84
authored
7 years ago
by
Mihai Lefter
Browse files
Options
Downloads
Patches
Plain Diff
update plan
parent
c06a91cd
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
planning/PLAN.md
+33
-6
33 additions, 6 deletions
planning/PLAN.md
with
33 additions
and
6 deletions
planning/PLAN.md
+
33
−
6
View file @
dbe48e84
...
...
@@ -27,11 +27,13 @@
| Hematopoiesis | Sanquin |
| Molecular Epidemiology | LUMC |
| Dermatology | LUMC |
| Directorate Education and Study Programmes |
|
| Directorate Education and Study Programmes |
LUMC
|
| ? | Leiden University |
| ? | Leiden University |
| Dermatology | LUMC |
# Previous course program
## Introduction (9:00 - 9:30) - Jeroen
-
version control definition
-
motivation
...
...
@@ -75,9 +77,6 @@
-
HEAD
-
.gitignore
Posssible changes:
-
introduce already the commit graph and make it more visual for quicker understanding
## Practical (10:30 - 11:00)
-
create a repository
-
create a file inside the repository
...
...
@@ -121,7 +120,7 @@ Posssible changes:
## 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
*
briefly on branches
-
inspecting the commit graph
...
...
@@ -139,4 +138,32 @@ Posssible changes:
-
check the commit graph
-
do a fast-forward merge
-
do a three-way merge
-
resolve a merge conflict
\ No newline at end of file
-
resolve a merge conflict
# 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)
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment