Preliminary version of merging lecture

c8b48c76 · Vermaat · 6b2439ab · c8b48c76 · c8b48c76 · c8b48c76
Commit c8b48c76 authored 9 years ago by Vermaat
--- a/README.md
+++ b/README.md
@@ -41,7 +41,7 @@ GitLab server and using Git for data analysis projects.
 | 11:45 | *Practical*       |                   |                           |
 | 12:00 | Lunch             |                   |                           |
 | 13:00 | *Practical*       |                   |                           |
-| 13:30 | **Git conflicts** | Martijn Vermaat   | Resolving merge conflicts, protected branches |
+| 13:30 | **Combining changes by merging** | Martijn Vermaat   | Resolving merge conflicts, protected branches |
 | 14:15 | *Practical*       |                   |                           |
 | 14:45 | Break             |                   |                           |
 | 15:00 | [Data analysis](usecases/) | Szymon M. Kiełbasa   | More GitLab, Markdown, data analysis use case |

--- a/merging/Makefile
+++ b/merging/Makefile
+../presentation/Makefile
\ No newline at end of file
--- a/merging/beamerthemelumc.sty
+++ b/merging/beamerthemelumc.sty
+../presentation/beamerthemelumc.sty
\ No newline at end of file
--- a/merging/gen2phen_logo.eps
+++ b/merging/gen2phen_logo.eps
+../presentation/gen2phen_logo.eps
\ No newline at end of file
--- a/merging/images/branches.eps
+++ b/merging/images/branches.eps
--- a/merging/images/branches.png
+++ b/merging/images/branches.png
--- a/merging/images/commit.eps
+++ b/merging/images/commit.eps
--- a/merging/images/commit.png
+++ b/merging/images/commit.png
--- a/merging/images/example-branched.eps
+++ b/merging/images/example-branched.eps
--- a/merging/images/example-branched.png
+++ b/merging/images/example-branched.png
--- a/merging/images/example-committed.eps
+++ b/merging/images/example-committed.eps
--- a/merging/images/example-committed.png
+++ b/merging/images/example-committed.png
--- a/merging/images/example-hue-ahead.eps
+++ b/merging/images/example-hue-ahead.eps
--- a/merging/images/example-hue-ahead.png
+++ b/merging/images/example-hue-ahead.png
--- a/merging/images/example-merged-ff.eps
+++ b/merging/images/example-merged-ff.eps
--- a/merging/images/example-merged-ff.png
+++ b/merging/images/example-merged-ff.png
--- a/merging/images/example-merged.eps
+++ b/merging/images/example-merged.eps
--- a/merging/images/example-merged.png
+++ b/merging/images/example-merged.png
--- a/merging/images/example.eps
+++ b/merging/images/example.eps
--- a/merging/images/example.png
+++ b/merging/images/example.png