From b91e1acb47651115bc35a109b8ea28a30ab6b406 Mon Sep 17 00:00:00 2001
From: Christian Krause <christian.krause@idiv.de>
Date: Thu, 11 Oct 2018 10:49:34 +0200
Subject: [PATCH] adds rebase backup slide
---
basics.html | 33 +++++++++++++++++++++++++++++++++
1 file changed, 33 insertions(+)
diff --git a/basics.html b/basics.html
index 7e9eb82..c287e89 100644
--- a/basics.html
+++ b/basics.html
@@ -821,6 +821,39 @@
<section id="eof" data-background="img/trex.png">
<h1>EOF</h1>
</section>
+
+ <section>
+ <section id="backup" data-markdown>
+ # backup slides
+ </section>
+
+ <section id="collab-conflicts-rebase" data-markdown>
+ ## rebasing
+ ### maintainer
+
+ ```bash
+ git remote add alice https://...
+ git fetch alice
+ git rebase master alice/topic/feature
+ # fix conflicts
+ git push
+ # close merge request
+ ```
+
+ ### contributor
+
+ ```bash
+ git fetch upstream
+ git rebase origin/master topic/feature
+ # fix conflicts
+ # force push because branch history changed
+ git push --force
+ ```
+
+ notes:
+ - manually close merge request because no merge commit
+ </section>
+ </section>
</div>
</div>
--
GitLab