From d159319c435c2ff94566f19f42a02b75690b5997 Mon Sep 17 00:00:00 2001
From: Daniel Duarte Tojal <daniel.duarte.001@student.uni.lu>
Date: Wed, 28 Aug 2019 08:35:40 +0200
Subject: [PATCH] create rebase pres2
---
2019/2019-09-09_testCourseAdv/slides/list.json | 5 +++++
.../slides/rebasePresentation2.md | 9 +++++++++
2 files changed, 14 insertions(+)
create mode 100644 2019/2019-09-09_testCourseAdv/slides/rebasePresentation2.md
diff --git a/2019/2019-09-09_testCourseAdv/slides/list.json b/2019/2019-09-09_testCourseAdv/slides/list.json
index 6b961795..63167121 100644
--- a/2019/2019-09-09_testCourseAdv/slides/list.json
+++ b/2019/2019-09-09_testCourseAdv/slides/list.json
@@ -29,6 +29,11 @@
"attr": {
}
},
+ {
+ "filename": "rebasePresentation2.md",
+ "attr": {
+ }
+ },
{
"filename": "rebase-iIntro.md",
"attr": {
diff --git a/2019/2019-09-09_testCourseAdv/slides/rebasePresentation2.md b/2019/2019-09-09_testCourseAdv/slides/rebasePresentation2.md
new file mode 100644
index 00000000..29a4b2bd
--- /dev/null
+++ b/2019/2019-09-09_testCourseAdv/slides/rebasePresentation2.md
@@ -0,0 +1,9 @@
+## Rebasing Workshop
+
+* rebase the develop branch onto your branch
+```bash
+$ git checkout myBranchName
+$ git rebase develop
+```
+
+* check the history of your branch again
\ No newline at end of file
--
GitLab