From be88351155e59699087f6d4bd825a173f0d113b2 Mon Sep 17 00:00:00 2001
From: mlefter <m.lefter@lumc.nl>
Date: Wed, 23 Aug 2017 13:42:09 +0200
Subject: [PATCH] update plan with what to add

---
 planning/PLAN.md | 48 ++++++++++++++++++++++++++++++++++--------------
 1 file changed, 34 insertions(+), 14 deletions(-)

diff --git a/planning/PLAN.md b/planning/PLAN.md
index 91cb177..12d4f88 100644
--- a/planning/PLAN.md
+++ b/planning/PLAN.md
@@ -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 
 
-- 
GitLab