From 35487604ce633c52ee8db6d0311eb3a2389e4ecd Mon Sep 17 00:00:00 2001 From: Daniel Duarte Tojal <daniel.duarte.001@student.uni.lu> Date: Mon, 2 Sep 2019 09:59:42 +0200 Subject: [PATCH] extrended instructions on rebasePres --- .../2019-09-09_testCourseAdv/slides/rebasePresentation1.md | 2 ++ .../2019-09-09_testCourseAdv/slides/rebasePresentation2.md | 7 +++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/2019/2019-09-09_testCourseAdv/slides/rebasePresentation1.md b/2019/2019-09-09_testCourseAdv/slides/rebasePresentation1.md index 2b419c01..322b8e03 100644 --- a/2019/2019-09-09_testCourseAdv/slides/rebasePresentation1.md +++ b/2019/2019-09-09_testCourseAdv/slides/rebasePresentation1.md @@ -2,11 +2,13 @@ * Create a file in your branch ```bash +$ git checkout myBranch $ echo "# message" > yourName.md ``` * Then create a file in the develop branch ```bash +$ git checkout develop $ touch startRebase.txt ``` diff --git a/2019/2019-09-09_testCourseAdv/slides/rebasePresentation2.md b/2019/2019-09-09_testCourseAdv/slides/rebasePresentation2.md index 29a4b2bd..6bec8f30 100644 --- a/2019/2019-09-09_testCourseAdv/slides/rebasePresentation2.md +++ b/2019/2019-09-09_testCourseAdv/slides/rebasePresentation2.md @@ -2,8 +2,11 @@ * rebase the develop branch onto your branch ```bash -$ git checkout myBranchName +$ git checkout myBranch $ git rebase develop ``` -* check the history of your branch again \ No newline at end of file +* check the history of your branch again +```bash +$ git log +``` \ No newline at end of file -- GitLab