diff --git a/2019/2019-09-09_testCourseAdv/slides/rebasePresentation1.md b/2019/2019-09-09_testCourseAdv/slides/rebasePresentation1.md index 2b419c01240762ec97e4344a77d04ae3aa623d7a..322b8e03f968380bcac93b0deb10c68d82b306fc 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 29a4b2bdb690c11baed7b8a42ac04eaf6bc132f6..6bec8f30a7add35bdf966305f887ef54d5f66f3c 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